You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2025/04/24 05:31:20 UTC
(cloudstack) branch fix-ntw-perm-test-vmware updated (6f02b94e691 -> fca85033fc7)
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch fix-ntw-perm-test-vmware
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 6f02b94e691 Smoke test vmware: Fix test_network_permission failure seen on vmware
omit 992c4b3d4a0 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit f6f33c6add3 Fix the size of a template downloaded from secondary storage (#10662)
omit 255a45c4a62 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit 45bac89b831 Fix NPE on updating security groups for an instance (#10493)
omit 0da243d6604 Fix issue with allocator not considering subsequent clusters (#10603)
omit 0af887bce12 UI: Update message of load balancer for autoscaling group (#10750)
omit a95e9d7f77d Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit 2771586b87f Merge release branch 4.19 to 4.20
omit 199170be433 utils: fix extra slash in Redfish default systems url path (#10630)
omit d7765343efe Merge branch '4.19' into 4.20
omit 207a2c1da35 Support ConfigDrive with VPC (#10495)
omit a09354ddf5f Fix volume migration failure response (#10707)
omit 40d549b0752 backport 10273 (#10702)
omit ac6b1b382cf Migrate public templates that have URLs on data migration across secondary storages (#10364)
omit 6de084ca976 Add download link of volumes, templates and ISOs to the download event details (#10564)
omit 53001417a04 UI: Fix column name in Usage view (#10700)
omit dd1c32cd262 undo removal of accessLogger and deal with some warnings (#10567)
omit 53700809ed3 fix conflict - logger
omit 4ac8861f5ee Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit d1df418c3c9 UI: Restore AS Numbers and IPv4 Subnets menus (#10580)
omit 6850147c9e8 Merge branch '4.19' into 4.20
omit bc5728a7ff0 systemvm: Bump systemvm template version to debian 12.10 (#10628)
omit 5f93ce71bb9 Merge branch '4.19' into 4.20
omit 0b7aef7a0f7 enhancement: iterate directly on HostJoinVO (#10613)
omit 6b4adbb20a3 Preview-Experimental Support EL10 as Management Server and KVM host (#10496)
omit 16b7b71e36e Fix secondary storage selectors feature (#10546)
omit 8df1161f14e framework-config: improve configkey caching (#10513)
omit 653b9738400 Update ubuntu image link for template download (#10559)
omit 33cdddfcd1b Fix to propagate updated management servers list and lb algorithm in host and indirect.agent.lb.algorithm settings resp, to systemvm agents (#10524)
omit 704d7a97879 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit e091aad792b Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit f8adedc2802 Merge release branch 4.19 to 4.20
omit 54c1f92efd2 Fix Stats Collector to not divide by zero (#10492)
omit 0427abf855f Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
omit b8359e8f62e UI: Allow custom footer in password reset page (#10461)
omit 8b092951cbd prometheus: don't poll the same tag multiple times (#10450)
omit 35a7438033a test: fix failure in test_06_purge_expunged_vm_background_task (#10501)
omit cdf19b552ca lint: fix test_linstor_volumes.py (#10502)
omit a841ed949fc Refactor alert email generation method (#8831)
omit 80b5d5c0298 ui: do not cache config.json and locale files (#10497)
omit 7f4e6a9d51d NAS B&R Plugin enhancements (#9666)
omit a6b1403ca6c Merge branch '4.20' of https://github.com/apache/cloudstack into 4.20
omit 5cbe3da703c Remove isMirrored hardcoded parameter value from execution of createDiskOffering API through UI (#10474)
omit 48ed5e24175 Merge branch '4.19' into 4.20
omit 3aabedd4473 UI: Proper explanation for the global setting to avoid ambiguity (#10042)
omit b92fd17ef15 UI: Add change host password (#10337)
omit 9b8c862f9f6 removing the usage of volumeFreeze StorPool API call (#8575)
omit bdae23ed536 Fix listing disk offerings for newly created VMs that haven't yet been started (#10476)
omit 2d00933d65e systemvmtemplate: bump version Debian 12.9.0 and ACS 4.20.1 (#10462)
omit 88916dcf2bb Merge branch '4.19' into 4.20
omit 91db905659d Merge commit '5526ef0168c' into 4.20
omit 37c4df9ada1 fix: enforce the cpu shares within allowed range (#10221)
omit e8ac477e9f8 engine/orchestration: fix missing vm powerstate update vm state (#10407)
omit 08ad1c70ba3 Merge branch '4.19' into 4.20
omit c80b8860e49 Fix hostId verification on unsuccessful expunge operation (#10418)
omit 4b432c82ca0 List only those hosts matching source host arch in multi-arch zones (#10369)
omit ee32f4cfe8c Add cpu speed detection methods (#9762)
omit c0e05c4a6d7 Fix Usage inconsistencies (#9888)
omit 21b5e4dcae5 Veeam: set backed_volumes for each backup (#9898)
omit 6a3314c40b9 Fixup alerting and logging error in BGPServiceImpl (#10252)
omit c121d5bb6db usage: use runtime scope when running maven usage profile (#10331)
omit 789f94b664a VR: fix duplicated lines in .htaccess (#10254)
omit 5204960bac8 made id parameter required (#10338)
omit 69285a62c94 UI: Fix selection of domain filters in the `SearchView` component (#10386)
omit 07564b7933e Enable multiple services on configdrive network service provider (#10372)
omit 8e1f5b1e49b Fill fields in login, forgotPassword and resetPassword from url (#10291)
omit 42a77c76461 LinstorStorageAdaptor: fix lint error (#10378)
omit 8c4a085a16d Validate the direct downloaded template file format (QCOW2) if the template file exists (#10332)
omit 59e054396a8 UI: Fix all list items appearing twice in search view (#10365)
omit 4f3e8e8c5a6 Merge branch '4.19' into 4.20
omit 5aa79a6e05d UI: Add offer ha column to system offerings table (#10297)
omit 50a54dde5cc Make Description as optional in network acl list (#10343)
omit c5afee21018 UI improvements (#9773)
omit 986ec81b664 Add direct download option to Users GUI (#10193)
omit 085bd3bda5f Merge branch '4.19' into 4.20
omit 0b5a5e8043d api,agent,server,engine-schema: scalability improvements (#9840)
omit ae2ffbe40bf Merge remote-tracking branch 'apache/4.19' into 4.20
omit 4201a2dc11b Fix Usage job not executing successfully (#10244)
omit 717ce981d4d Merge release branch 4.19 to 4.20
omit 33a37da9ec7 server: investigate pending HA work when executing in new MS session (#10167)
omit 34d2a3bc86d Merge branch '4.19' into 4.20
omit 7e295ec4e19 [KVM] Add watchdog model none to disable use of watchdogs on KVM agent (#10203)
omit 96b757c35bc packaging: have noarch defined for rpms (#10057)
omit 5167c3b613f Merge branch '4.19' into 4.20
omit a163831b7e8 Maintenance mode: Add host to deployment planner avoid list to fix local storage vm migration (#9892)
omit 9f594c96991 Merge branch '4.19' into 4.20
omit 2300c1caa3a Add project-user association normalization script to 4.20.1 upgrade (#10116)
omit bf1ff10a906 Merge branch '4.19' into 4.20
omit d9a7b6e511b Rollback of changes with errors during the VM assign (#7061)
omit e2cfddb1b6a Merge branch '4.19' into 4.20
omit ab76d3c9ccb merge errors fixed
omit 4f9c3492ec9 Merge release branch 4.19 to 4.20
omit bd488c4bba0 server, plugin: enhance storage stats for IOPS (#10034)
omit 9bc283e5c26 Introducing granular command timeouts global setting (#9659)
omit a4224e58ccf Improve logging to include more identifiable information (#9873)
omit cfafcaeb01b log name change after merge forward
omit 79316450d19 Merge release branch 4.19 to 4.20
omit 3d0b4fca847 UI: Add cluster arch type to the zone creation wizard (#10080)
omit 41c27e116c6 Merge release branch 4.19 to 4.20
omit 32af4a25d01 Update ownership selection component to be language independent (#10052)
omit 330ed25a6c1 Support to enable/disable VM High Availability manager and related alerts (#10118)
omit cbac6cc05bd Add ownership selection to VPC form (#10124)
omit b7f0aac5194 Merge branch '4.19' into 4.20
omit ac19379c967 UI: create VPC network offering with conserve mode (#10082)
omit 14460f49e15 Merge remote-tracking branch 'apache/4.19' into 4.20
omit e57a82a4f52 UI: Fixes in the Usage UI (#10000)
omit 9231c1c6ba9 Merge remote-tracking branch 'origin/4.19' into 4.20
omit 810c4108c7b engine/schema: Add access modifier to `VolumeVO` (#9394)
omit 4c801e24f44 Fix Create dropdown menu not changing language (#10023)
omit 0eb94a13962 move upgrade code to the right file (#10036)
omit 8b9db0869f3 Merge release branch 4.19 to 4.20
omit 9960e400309 UI: Fix userdata and load balancer selection (#10016)
omit 5ee61c226a3 Merge branch '4.19' into 4.20
omit b3dc402aa8f engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade (#10018)
omit 666efc4b974 Simplify validation for creating volume templates via UI (#9828)
omit da542345855 Merge branch '4.19' into 4.20.merge
omit 52e7b41a54e Add support for functionality in hypervisor class (#9736)
omit f3a474bb9ef UI: make a newly added Network the default one (#9708) (#10022)
omit d17de834a57 Disable API Key Access for users, accounts and domains (#9741)
omit 58138f2da30 fix: remove double <form> element from 2FA form (#9851)
omit 8a1da3804c0 Resize volume: add pool capacity disablethreshold for resize and allow volume auto migration (#9761)
omit 34056d956ca Improvement: management server peer states (#9885)
omit 22a66044918 Routed mode: minor improvements and fixes (#9697)
omit 8f63660424a pom.xml: revert systemvm template version to 4.20.0.0 (#10004)
omit 5886780240b Change vmsnapshot.max config to be dynamic (#9883)
omit 2c412f8947c Adjust misformatted logs (#9889)
omit dc0ebe985c4 Remove info about the environment from exception when revert VM snapshot (#9944)
omit a2d5aa997fc displaying info of the labels from form CreateSSHKeyPair (#9970)
omit c63c7ee63e5 Updating pom.xml version numbers for release 4.20.1.0-SNAPSHOT
omit 2fe3fcef7c7 Updating pom.xml version numbers for release 4.20.0.0
omit 8a2c0f3f732 UI: Improve filtering of VM and template settings (#9683)
omit a82a2429f49 Merge branch '4.19'
omit b75742da431 enum name changed for logger update reverted (#9922)
omit b38ee63c48a Merge branch '4.19'
omit 8608f28842b Fix ctrl-enter on vm start dialog (#9743)
omit f7b7339bcfb Merge branch '4.19'
omit 8af08ddafbc Merge branch '4.19'
omit be247334a7f StorPool: fix of delete snapshot (#9855)
omit 019f2c60ceb server: fix vm_stats records are not removed if batchsize is 0 (#9818)
omit 20901c74430 Merge remote-tracking branch 'origin/4.19'
omit 627784eaf62 packaging: add libvirt-daemon-driver-storage-rbd as cloudstack-agent dependency (#9799)
omit 46201ee0437 Merge remote-tracking branch 'origin/4.19'
omit f10d9fecbe8 fix forward-merge errors
omit 843c1950e7c Fix Listing backup schedules (#9749)
omit c0add074acc Fix `updateTemplatePermission` when the UI is set to a language other than English (#9766)
omit bcc81799eaa Merge remote-tracking branch 'apache/4.19' into main
omit 554ea220f01 Fix merge errors
omit dbfc7f23a7f Merge branch '4.19'
omit 046870ef764 debian12: update debian/control (#9738)
omit 2fa17617ba6 Merge release branch 4.19 to main
omit c1594714343 Shutdown expunged resources cleanup executor properly, and allow other components to configure/start/stop on error (#9723)
omit 04c428cb2f7 CKS: add ConfigDrive to cloud-init datasource_list in systemvm template (#7650)
omit bf2cedea79c Merge branch 4.19 to main
omit 4ce86711f96 PowerFlex on demand disable config key (#9664)
omit 21d107c3499 Merge branch '4.19'
omit a303c7c91ae Fix build errors (#9714)
omit 477beaffbf9 merge conflicts (in loggers)
omit 41e7a2a6897 Merge release branch 4.19 to main
omit 94a47ac7783 VR: fix password server exception when no password is found (#9699)
omit 7d95952bc1a Enable Backup and Recovery for Shared Filesystems (#9676)
omit 1d37ff23ac1 pre-commit run --all-files; fix end of file with ui/src/style/objects/form.scss (#9696)
omit a506bf1f2e6 refactor schema-41910to42000.sql (#9680)
omit aa6447636eb Fix toc generation for api docs (#9655)
omit 5f8077824af Implemented the lateral expansion of the area-box in the forms (create/update) of the quota tariff (#9681)
omit f37afa829dd Fixed listEvents intermittent exception: (#9661)
omit a88967bf617 Minor naming changes in Shared FileSystems 4.20 Feature (#9675)
omit 1d4700a0bdd Provide encryption key for DATA volume type (in addition to ROOT) to copy volume. (#9663)
omit b19c069ade5 allow domain suffix update in shared networks (#9585)
omit 68f459b334c CapacityManagementImpl.updateCapacityForHost(..) use VM update time in capacity calculation. (#9662)
omit 15e25bc1cef Merge release branch 4.19 to main
omit 0655075f51c Feature: Forgot password (#9509)
omit 638c1526d0a Fix the Cloudian Integration SSO Redirect link (#9656)
omit 6ec3c486ddb Enhance the `listAffinityGroups` API by adding the dedicated resources related to an affinity group (#9188)
omit b1f683db6b8 Allow more generic searches of ACLs (#9566)
omit 501d8c1e091 Add logs to CPVM connection process (#8924)
omit b068c68bffb merge conflict (in loggers)
omit abfa92928ce merge conflicts 4.19 -> main
omit 1303a4f323d Feature: Allow adding delete protection for VMs & volumes (#9633)
omit f8d8a9c7b38 NSX Integration fixes (#8906)
omit f156c4e0a5a Refactor type and range validation in configuration update process (#9107)
omit b11897cdfa8 Add logs to `LibvirtComputingResource`'s metrics collection process (#8511)
omit 82f113b1e1a ui: refactor config update/reset notification (#9639)
omit 8c8d115a1e1 feature: Support Multi-arch Zones (#9619)
omit 52b06962bcd engine/schema: update url links to match new systemvmtemplate names (#9647)
omit f683d2dd241 Merge remote-tracking branch 'origin/4.19'
omit 679ce1a6395 feature: Dynamic and Static Routing (#9470)
omit 85765c3125f backup: simple NAS backup plugin for KVM (#9451)
omit c3f0d14d315 storage/object: Add support for Ceph RGW Object Store (#8389)
omit 605534b4173 feature: Shared Storage Filesystem as a First Class Feature (#9208)
omit 72d0546d8b0 Shared Network Firewall (Security groups) in Advanced zone without security groups (#9415)
omit 6a559f46e3c Go back to default timestamp on logging (#8925)
omit 716ab205ea4 Added update, enable, disable events to the updateStoragePool API (#9543)
omit 2245d985986 Merge remote-tracking branch 'origin/4.19'
omit b7a2b0419cc server: Global setting to allow/disallow users to force stop a vm (#9569)
omit 36d37f70a82 Display associated resource name on storage pools objects (#9449)
omit 7e085d5e1df framework/db: use HikariCP as default and improvements (#9518)
omit 31b0ed0a18c framework/config,server: configkey caching (#9628)
omit 787acfd1725 vmware: Add support for VMware 8.0u2 (8.0.2.x) and 8.0u3 (8.0.3.x) (#9591)
omit 5ff0b999da2 Bump org.apache.commons:commons-compress from 1.21 to 1.26.0 (#8683)
omit b155e3d2090 Merge remote-tracking branch 'origin/main'
omit 60c9c9adb67 Merge remote-tracking branch 'origin/4.19'
omit bc393923515 Fix PR lint error caused by deps/install-non-oss.sh (#9631)
omit f9451fce3a3 Notify users when upgrades are available or restart is required for network or VPC (#7610)
omit 39152323e3b kvm: Present the UUID of the VM as serial through smbios information (#9236)
omit a0e16c55dac updated install-non-oss with vmware v7.0 and v8.0 (#9205)
omit 24dc3178a39 Testcases Added (#9116)
omit f2a1ee57cac Update en.json (#8958)
omit 882dea21c1f Update .asf.yaml (#9629)
omit 628aba618b5 add min details to search view (#9616)
omit f9c4edc66fa SystemVM template changes - updated debian version & other changes (#9625)
omit 0692a296ce9 engine-orchestration: fix issue for empty product in vm metadata (#9610)
omit 929cfbc3e26 Update to Debian 12 (#9627)
omit af607b9c4e7 Merge branch '4.19'
omit 8c301b16ff3 fixed incorrect label in vrs and svms (#9617)
omit a5f55602fc3 LOGGER -> logger in CloudInitUserDataProvider.java
omit 6e988b8953f Merge remote-tracking branch 'apache/4.19'
omit 12d9c26747d Added support for storpool_qos service (#8755)
omit 2a1db67eeb6 Improve logs in primary storage removal process (#8649)
omit e6cb7f26ac2 systemvm: have flags to check x86_64 to install specifics for amd64 arch (#9600)
omit 5a496e725b9 Merge remote-tracking branch 'apache/4.19'
omit 7692b745e8a Fix NPE when sending copy command to least busy SSVM (#9125)
omit c05edc40f4c Updated invalid parameter/value to com.cloud.exception.InvalidParameterValueException (#9455)
omit 70131be8c22 Fix `deleteAccount` API to prevent deletion of the caller (#8743)
omit ede39d8edc4 Configuration to disable URL validation when registering templates/ISOs (#8751)
omit d32ace6731d New Feature: Enable/Disable Roles (#9549)
omit d7ca05e5ba9 Build: drop EL7 support, support JRE17 for packages and sonar check (#8609)
omit b61c3b81022 add domainpath to WebhookResponse
omit f5efe56fb53 Merge remote-tracking branch 'apache/4.19'
omit bc286656796 Add support for network data in Config Drive (#9329)
omit c9f1c5790d1 Fix snapshot scheduling with expired jobs (#8832)
omit 1e12a802104 orchestration,hypervisor: allow custom manufacture, product for vm (#9163)
omit b215abc30a2 server: do not check affinity groups if no vm group mappings (#9542)
omit 9b22cd590d2 Download Volume Snapshots (#8878)
omit f5c7729871a Fix to allow actions on the network if it belongs to a project (#9550)
omit b1057166aee Merge branch '4.19'
omit 1ef0833e7a3 UI: Add filter to list encrypted volumes (#9548)
omit 296a44e932e Fix main branch issues (#9553)
omit 7fb8d77eb84 UI: Improve router listing page (#9551)
omit f84e04372c9 Fix being able to expunge a VM through destroyVirtualMachine even when role rule does not allow (#8689)
omit 5bf81cf0023 Merge release branch 4.19 to main
omit 2ba64f2521a fix removeSecondaryStorageSelector response for docs (#9264)
omit 8ca1843efae Allow deletion of system VM templates (#8556)
omit 01c721fcda5 Improvements to quota tariffs APIs and UI (#9225)
omit 3399abddb0c NSX: add back removed code for NSX (#9435)
omit 287a47266b0 Merge branch '4.19'
omit cf1428ddcca Fix column from op_dc_ip_address_alloc not being referenced correctly by its ORM class (#8812)
omit b429e843cd1 created VPC message a little less misleading (#9396)
omit cc1dcf51b77 Merge remote-tracking branch 'origin/4.19'
omit cb0527d7050 ui: rename autoscale instance group to simply autoscaling group (#9487)
omit 161d156af1a Support user resource name / displaytext with emoji, unicode chars, and some sql exception msg improvements (#9340)
omit 47a6b7011d7 Fix build
omit b73f634ea61 Merge branch '4.19'
omit 5baac44139d ui: add UI too to view and download usage records (#8615)
omit 7214c13e106 packaging: bundle latest cmk x86 build with deb and rpm packages (#9450)
omit cd8442a42b6 test: improve purge expunged resources b/g task testcase (#9426)
omit 7f4a6861b3a Merge remote-tracking branch 'origin/4.19'
omit f358813e1d1 Merge remote-tracking branch 'origin/4.19' into main
omit 1662af131e7 [4.20] VR: fix issue if userdata is binary data (#8739)
omit 817251f1f89 Enhancement in the accuracy of the logs regarding the capacity, usage, and threshold of secondary storages (#9043)
omit dc1556ca383 Change exception when orchestrating VM start (#9062)
omit d41dc17b2c2 Merge remote-tracking branch 'apache/4.19'
omit f24fb20e6b3 ui: add new API docs tab (#9409)
omit 56c661c1dff Icon changed for control-outlined (#9402)
omit 35fd17c62ee Merge branch '4.19'
omit afdf4d7d46c Add limit configuration for number of projects (#9172)
omit b9c7275c253 Quota tariff order (#8347)
omit a87778be9a4 Refactor KubernetesClusterResourceModifierActionWorker (#8801)
omit 77cc75ab02a Fix radio buttons in instance migration pop-up (#8836)
omit 407990650f6 Improvements on information about disk sizes and offerings on VM deployment wizard's InfoCard (#9249)
omit 2919cac6432 pre-commit: add `codespell` to check spelling (#8197)
omit c923e673cfd pre-commit: add `XML` files to the `trailing-whitespace` check (#9131)
omit cea4801be18 Merge remote-tracking branch 'origin/4.19'
omit 9f1577d2a8d pre-commit: check more file types for trailing whitespace (#9352)
omit 806692bceaa pre-commit: enable Python flake8 rule `E272` (#9361)
omit c6d3f6e623e pre-commit: enable Python flake8 rule `E271` (#9358)
omit a1d8bab43f2 Bump actions/cache to `v4` (#9353)
omit 354627a19d5 UI: fix CreateIsolatedNetworkForm.vue (#9359)
omit 0af88353fbd Merge branch '4.19'
omit b69cc0272d4 pre-commit: enable Python Flake8 rule `E713` (#9016)
omit 1144f5258d5 Merge remote-tracking branch 'apache/4.19'
omit 3c9bc07d069 Merge remote-tracking branch 'apache/4.19'
omit a35d79a681e ui: fix minor issue with webhook forms (#9335)
omit 7c32bd2506e Fixup main build errors (#9330)
omit de683a51633 add ownership selection to create volume (#9265)
omit 0ec7c728758 Merge branch '4.19'
omit e010c9be936 Fixup main build error (#9314)
omit 90fe1d5fdcc Merge branch '4.19'
omit 3a0c3125916 fix build error with FiberChannelAdapter after forward-merge
omit 3923f80c225 Merge branch '4.19'
omit f6ceeab3b3a server: Enforce strict host tag check (#9017)
omit 8806e44e4fb Merge release branch 4.19 to main
omit fbeee491377 fix build errors after forward-merge
omit d81ffd2d864 Merge remote-tracking branch 'apache/4.19'
omit 3e6900ac1a5 api,server: purge expunged resources (#8999)
omit 373f0170020 Merge branch '4.19'
omit a9caee3c6f8 add readratemax and writeratemax (#9227)
omit aab13619491 server: fix mgmt server 503 error by renaming kubernetesClusterHelper to kubernetesServiceHelper
omit 3a5c4a0cba5 fix build error with LinstorVMSnapshotStrategy
omit cb9b3134f7f Merge branch '4.19'
omit 1cf1786ebb8 [Quota] Add API to list preset variables (#8372)
omit cb48202b348 fix build error LibvirtGetVolumeStatCommandWrapper
omit 6fe835e1183 Merge branch '4.19'
omit 525c2c6fe93 Show in which primary storage volumes are allocated in instance details page and volume migration pop-ups (#8835)
omit 6fda757936b While starting VM with 'considerlasthost' enabled, don't load host tags/details for the last host when it doesn't exist [main] (#9063)
omit 64593574d88 test update and get connected hosts (#9136)
omit 66f7f762636 fix createVMSchedule action name (#9226)
omit c9a95bc22c5 Add unit tests for null cpu for null parameters for set allocated cpu (#9137)
omit faf94387a63 Disable logs to stdout and capture remaining stdout logs to a file (#8880)
omit 3b8d2202dcd fix unwanted kvm root volume migration (#8908)
omit 3fe2b46dd0b [UI] Add option to specify account/project while deploying VMs and creating networks (#8919)
omit 1383625c93e Fix `*.smtp.useAuth`, `quota.usage.smtp.useStartTLS` and `*.smtp.enabledSecurityProtocols` settings definitions (#9031)
omit ee39104ec04 fix null host tags while creating zone (#8976)
omit 21d07132add engine-schema: make adding/dropping indexes idempotent (#9171)
omit 8d211e75c01 Merge remote-tracking branch 'origin/4.19'
omit cc8dc84f647 server: fix resource reservation leakage (#9169)
omit be552fdce9c feature: webhooks (#8674)
omit 2542582c1e0 logging migration in merge missing
omit 81cdf3cfbfe Fix instance & backup resource table columns (#9147)
omit b29391c3291 Merge LTS branch '4.19' into main
omit 0c615312f95 log messages (#9093)
omit 19f96355ac0 Update .asf.yaml
omit 9b3c318db6a upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (#8893)
omit 5433e775e53 New feature: Implicit host tags (#8929)
omit f1c3d2c4bee Merge release branch 4.19 to main
omit 28e8e2d0096 pre-commit: add hook to trim trailing whitespace (#8205)
omit 40c5d353773 Fix spelling in docs, logs, exception messages etc (#9076)
omit e159a593f12 Add `markdownlint` with `pre-commit` (#9078)
omit c563fda0819 Add two more `pre-commit` hooks (#9077)
omit 371ce12abef Normalize dates in Usage and Quota APIs (#8243)
omit acce88ff392 Merge remote-tracking branch 'apache/4.19'
omit e817e04343a Fix typo keyparis -> keypairs in InvalidParameterValueException (#9100)
omit b38f1364e6a Merge branch '4.19'
omit 2a63483b4c5 framework/config: make logic in ::value() defensive (#9108)
omit 5f73172bcbe Fix failure test with ConfigKeyScheduledExecutionWrapperTest (#9103)
omit 21af134087a Fix exceeding of resource limits with powerflex (#9008)
omit e9ff2707bbd Merge branch '4.19'
omit 0d1bc7dfd0c Limit `listRoles` API visibility (#8639)
omit 0d8f7d40037 Merge release branch 4.19 to main
omit ab8197c55e1 Add password enabled during ISO register and update (#8992)
omit 433956c6ae1 Merge remote-tracking branch 'origin/4.19'
omit d5241d319c3 Merge release branch 4.19 to main
omit db572f4478d Fix spelling, word case, duplicate words in code comments only (#8987)
omit f41c934c94a Fix build error with MigrateKVMAsync
omit e61f3bae4da Merge branch '4.19'
omit 54926c324ff sanatise log in case multiple passwordsa have been passed (#8891)
omit 6e823b2cd34 Order the `.gitignore` file (#8989)
omit 00ee5fd4298 Show menu section if user has access to at least one of its pages (#8978)
omit 380385d0451 plugin: fix nsx build failure with mvn 3.9 (#8974)
omit b93a86c9da8 Clean up `.asf.yaml` collaborators (#8982)
omit cfdb33a0522 Fixup resource limit checks (#8935)
omit 89231106ff9 Hide volumes tab in instance page when user does not have permission to list volumes (#8713)
omit 836ef9ec709 Merge remote-tracking branch 'origin/4.19'
omit 27124c10319 Add ability to set cpu.threadspercore similar to existing cpu.corespersocket (#8850)
omit 0af923e6181 Merge branch '4.19'
omit a6f3560152b fix log4j to log4j2 issue (#8966)
omit e330d76a72d Log4j2 refactor cloud engine orchestration module (#8742)
omit 4fe2b66e9db add bernardodemarco to .asf.yaml collaborators (#8965)
omit 1efce77ead1 sanatise trace logging of async jobs (#8892)
omit a358c9a4102 Merge release branch 4.19 to main
omit 65eef59e0bd Merge release branch 4.19 to main
omit 6c24ff90985 pre-commit autoupdate (#8867)
omit 66c10bf42fd logger issues
omit c31aebc1886 Merge release branch 4.19 to main
omit 865da730e55 log sanitation on output of jobs (#8890)
omit 2ca3be41f7d Fix spelling in code comments (#8866)
omit 93d4816ee8e Merge remote-tracking branch 'origin/4.19'
omit bf9fdaddbd2 Fix build errors due to log4j 2.x changes
omit 7b57480d601 Merge remote-tracking branch 'apache/4.19' into main
omit 8ff2c018cc5 test: fix test failures in ActionEventInterceptorTest (#8938)
omit e1922da2499 merge forward error in logger name (#8949)
omit 3cabe69cd50 Merge release branch 4.19 to main
omit dfd5158d678 Allow kvm storage plugin to customize diskdef, add geometry (#8839)
omit 7de8a6d0826 Merge LTS branch '4.19' into main
omit 38ca11f99ac build: fix build failure after merge-forward
omit 63a0797b180 Introduce scheduled executor wrapper with dynamic interval (#8916)
omit ebaf5a47b94 Speedup resource count calculation (#8903)
omit 090c1e38a6b Improve vm.allocation.algorithm global setting description (#8823)
omit 31f28f6516d Limit infrastructure details revealed to the end user after a failed migration on KVM (#8680)
omit 45daa1ce591 Merge remote-tracking branch 'apache/4.19'
omit 19f79b1d94f Merge branch '4.19'
omit a44f28bb312 Merge branch '4.19'
omit 3fd5680d9a1 Merge remote-tracking branch 'apache/4.19'
omit 2959cc67652 cleanup collaborators (#8888)
omit 632eb40b7c3 add collaborator hsato03 (#8884)
omit 55b28d645fb Merge remote-tracking branch 'apache/4.19'
omit 02305fbc5f4 Merge remote-tracking branch 'apache/4.19'
omit ed7389caa38 add gpordeus as collaborator (#8879)
omit 9072f8ee1c8 Add ReservationDao bean to the Usage Server (#8868)
omit c4036800de5 Fix: check root disk offering tagged limits during VM deploy (#8871)
omit 93f31828f59 Hypervisor as class (#8798)
omit a0b642cdb85 Refactor cloud-agent module logs for Log4j2 (#8714)
omit 88d250487c2 Normalize characters with diacritics in Brazilian Portuguese locale (#8829)
omit 449ee8e509e Show network metrics for System VMs (#8679)
omit e44c17e0770 Fix spelling in docs and code comments only (#8774)
omit adc05f8d590 Fix XenServer nested extra configuration (#8698)
omit 4b4dfef96f5 fix simulator CI failure test_04_list_storage_pools_keyword_filter (#8814)
omit 12f65fbcc01 build/packaging: build nsx only if noredist is passed (#8772)
omit 9245354b434 Merge remote-tracking branch 'origin/4.19'
omit 01d44347e72 Merge remote-tracking branch 'origin/4.19'
omit 502a633ddd0 build: fix build failure after merge-forward
omit 0e32380e0a3 Merge remote-tracking branch 'origin/4.19'
omit 33dc7465c2b Merge remote-tracking branch 'origin/4.19'
omit f76c6f3ea97 Quota email configuration (#8307)
omit 7b02c4cc482 Add autofocus to 2FA input (#8766)
omit bb244842fa1 Merge remote-tracking branch 'apache/4.19'
omit 92bfb4dcaac Support KVM storage implementations controlling logical/physical block io size (#8724)
omit db564b12b69 Merge branch '4.19'
omit e87c6cfcb1d Fix resource count discrepancies (#8302)
omit 6dc3d06037c NSX integration (#7919)
omit 9a73a2f9e14 Display dates in Quota and Usage messages according to the timezone configurations (#8230)
omit 240db195674 Merge remote-tracking branch 'apache/4.19'
omit f36273888be build: fix logger post forward-merge
omit b29ec2bf12a Merge remote-tracking branch 'apache/4.19'
omit 68a3e9e8398 engine-schema,test: fix domain searchbuilder, test check (#8725)
omit 6f27b1f459f Improve logs when adding components to avoid set (#7214)
omit c8a4575bcd0 Fix `deleteUser` API to prevent deletion of the caller (#8691)
omit d1715821634 Fix false positives in Usage sanity checks of templates and network offerings (#8136)
omit 3baa45bc2a8 forward Merge branch '4.19' into main
omit 7342fbd8e1a docs: fix spelling in code comments (#8690)
omit 87284f03f08 Upgrade to JRE17 and Upgrade System VMs/VRs to Python3 and Debian 12 (#8497)
omit 0926e5c15a9 Merge remote-tracking branch 'apache/4.19'
omit 8f6721ed4c4 Improve some UserVmManagerImpl's methods name and docs (#8673)
omit 592038a3042 api,server,ui: granular resource limit management (#8362)
omit 6af1c25f520 Merge remote-tracking branch 'apache/4.19'
omit a31449b1049 Allow altering only either CPU or memory during VM live scale (#8234)
omit 4a0ca2071d3 An ICMP ACL rule should not be able to have code and type null (#8464)
omit 187f17c216d fix build errors with DRS plugins after merge-forward
omit 90526419a3d fix build error after merge-forward
omit 93406f5582b Merge remote-tracking branch 'apache/4.19'
omit 3291a62fc12 Allow locking and unlocking users via UI (#8337)
omit 9b18243b876 Fix merge forward bug (#8636)
omit cfb4d4378f2 Merge remote-tracking branch 'origin/4.19'
omit 4de2f38cd13 Adding vmId as part of error response when vm create fails. (#8484)
omit bb70da0fed9 add compute offering details in UI (#8563)
omit 0447040c08b Merge remote-tracking branch 'origin/4.19'
omit 49cecaed067 Normalize loggers and upgrade log4j 1.2 to log4j 2.19 (#7131)
omit 2bfa9de2825 Merge remote-tracking branch 'origin/4.19'
omit affead11607 Merge remote-tracking branch 'origin/4.19'
omit 399bd0a067d Upgrade to mockito 4 and handle Mockito deprecations (#8427)
omit 37bb24f29e0 Merge branch '4.19'
omit 4d370a3772d Merge remote-tracking branch 'origin/4.19'
omit 48410d0d67e Bump `actions/setup-python` to `v5` (#8419)
omit d8b4be6cef6 @alexandremattiioli is committer now (#8525)
omit 25009bfb764 Merge remote-tracking branch 'origin/4.19'
omit 8ea9fc911d1 StoragePoolType as class (#8544)
omit d353fcc599d engine-schema: upgrade path 4.19.0.0 to 4.20.0.0 (#8608)
omit d5d8b6d086a tools,changelog: fix nextversion 4.20.0.0-SNAPSHOT (#8607)
omit e33f98f52c4 Merge remote-tracking branch 'apache/4.19'
omit af8a582055c api/utils/ui: List protocol numbers and icmp types (#8293)
omit 7dffbc6e475 Updating pom.xml version numbers for release 4.20.0.0-SNAPSHOT
omit cf0d436fc82 Merge remote-tracking branch 'apache/4.19' into main
omit 39e0a8e8d43 Change Cryptsetup validation (#8482)
new fca85033fc7 Smoke test vmware: Fix test_network_permission failure seen on vmware
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 (6f02b94e691)
\
N -- N -- N refs/heads/fix-ntw-perm-test-vmware (fca85033fc7)
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.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 9 +-
.github/linters/.flake8 | 5 +-
.github/linters/.markdown-lint.yml | 100 -
.github/linters/codespell.txt | 526 ----
.github/workflows/build.yml | 4 +-
.github/workflows/ci.yml | 10 +-
.github/workflows/codecov.yml | 4 +-
.github/workflows/linter.yml | 2 +-
.github/workflows/main-sonar-check.yml | 8 +-
.github/workflows/rat.yml | 4 +-
.github/workflows/sonar-check.yml | 8 +-
.github/workflows/ui.yml | 2 +-
.gitignore | 134 +-
.pre-commit-config.yaml | 29 +-
.python-version | 2 +-
CHANGES.md | 16 +-
CONTRIBUTING.md | 18 +-
INSTALL.md | 4 +-
README.md | 2 +-
agent/bindir/cloud-setup-agent.in | 17 +-
agent/bindir/cloud-ssh.in | 4 +-
agent/bindir/libvirtqemuhook.in | 13 -
agent/conf/agent.properties | 11 -
agent/conf/cloudstack-agent.logrotate.in | 4 +-
agent/conf/environment.properties.in | 4 +-
agent/conf/log4j-cloud.xml.in | 145 +-
agent/pom.xml | 2 +-
agent/src/main/java/com/cloud/agent/Agent.java | 954 ++++---
.../src/main/java/com/cloud/agent/AgentShell.java | 100 +-
.../src/main/java/com/cloud/agent/IAgentShell.java | 2 -
.../cloud/agent/dao/impl/PropertiesStorage.java | 21 +-
.../cloud/agent/dhcp/DhcpProtocolParserServer.java | 7 +-
.../java/com/cloud/agent/mockvm/MockVmMgr.java | 22 +-
.../cloud/agent/properties/AgentProperties.java | 15 -
.../properties/AgentPropertiesFileHandler.java | 13 +-
.../consoleproxy/ConsoleProxyResource.java | 88 +-
.../test/java/com/cloud/agent/AgentShellTest.java | 19 -
agent/src/test/java/com/cloud/agent/AgentTest.java | 257 --
.../org.mockito.plugins.MockMaker | 1 +
api/pom.xml | 2 +-
api/src/main/java/com/cloud/agent/api/Command.java | 4 -
.../main/java/com/cloud/agent/api/LogLevel.java | 6 +-
.../com/cloud/agent/api/storage/OVFHelper.java | 59 +-
.../com/cloud/agent/api/storage/OVFParser.java | 9 +-
.../main/java/com/cloud/agent/api/to/BucketTO.java | 50 -
.../com/cloud/agent/api/to/FirewallRuleTO.java | 4 +-
.../com/cloud/agent/api/to/LoadBalancerTO.java | 24 +-
.../main/java/com/cloud/agent/api/to/NfsTO.java | 8 -
.../main/java/com/cloud/agent/api/to/NicTO.java | 19 -
api/src/main/java/com/cloud/agent/api/to/S3TO.java | 8 -
.../com/cloud/agent/api/to/StorageFilerTO.java | 3 +-
.../main/java/com/cloud/agent/api/to/SwiftTO.java | 8 -
.../com/cloud/agent/api/to/VirtualMachineTO.java | 27 -
api/src/main/java/com/cloud/bgp/ASNumber.java | 38 -
api/src/main/java/com/cloud/bgp/ASNumberRange.java | 31 -
api/src/main/java/com/cloud/bgp/BGPService.java | 44 -
api/src/main/java/com/cloud/capacity/Capacity.java | 9 -
.../java/com/cloud/configuration/Resource.java | 1 -
api/src/main/java/com/cloud/cpu/CPU.java | 67 -
.../main/java/com/cloud/dc/DedicatedResources.java | 4 -
.../com/cloud/deploy/DeploymentClusterPlanner.java | 11 -
.../java/com/cloud/deploy/DeploymentPlanner.java | 24 +-
api/src/main/java/com/cloud/event/EventTypes.java | 80 -
api/src/main/java/com/cloud/host/Host.java | 3 -
.../main/java/com/cloud/hypervisor/Hypervisor.java | 161 +-
.../cluster/KubernetesServiceHelper.java | 1 -
api/src/main/java/com/cloud/network/IpAddress.java | 2 -
.../main/java/com/cloud/network/Ipv6Service.java | 2 +-
api/src/main/java/com/cloud/network/Network.java | 12 +-
.../main/java/com/cloud/network/NetworkModel.java | 6 -
.../java/com/cloud/network/NetworkProfile.java | 31 +-
.../java/com/cloud/network/NetworkService.java | 9 -
api/src/main/java/com/cloud/network/Networks.java | 3 +-
.../com/cloud/network/VirtualRouterProvider.java | 2 +-
.../cloud/network/element/BgpServiceProvider.java | 31 -
.../element/LoadBalancingServiceProvider.java | 3 -
.../network/element/NetworkACLServiceProvider.java | 3 -
.../com/cloud/network/element/VpcProvider.java | 3 -
.../java/com/cloud/network/guru/NetworkGuru.java | 16 +-
.../com/cloud/network/lb/LoadBalancingRule.java | 4 -
.../java/com/cloud/network/nsx/NsxProvider.java | 34 -
.../java/com/cloud/network/nsx/NsxService.java | 36 -
.../java/com/cloud/network/vpc/VpcOffering.java | 11 -
.../cloud/network/vpc/VpcProvisioningService.java | 6 +-
.../java/com/cloud/network/vpc/VpcService.java | 3 +-
.../cloud/network/vpn/RemoteAccessVpnService.java | 2 +-
.../java/com/cloud/offering/NetworkOffering.java | 22 -
.../java/com/cloud/offering/ServiceOffering.java | 3 -
api/src/main/java/com/cloud/org/Cluster.java | 3 -
.../region/ha/GlobalLoadBalancingRulesService.java | 3 +-
.../cloud/server/ManagementServerHostStats.java | 2 -
.../main/java/com/cloud/storage/DataStoreRole.java | 1 -
api/src/main/java/com/cloud/storage/Storage.java | 11 -
.../java/com/cloud/storage/StorageService.java | 4 -
.../main/java/com/cloud/storage/StorageStats.java | 3 -
api/src/main/java/com/cloud/storage/Upload.java | 2 +-
.../storage/VMTemplateStorageResourceAssoc.java | 3 -
api/src/main/java/com/cloud/storage/Volume.java | 12 +-
.../java/com/cloud/storage/VolumeApiService.java | 24 +-
.../cloud/storage/snapshot/SnapshotApiService.java | 11 -
.../com/cloud/template/VirtualMachineTemplate.java | 3 -
api/src/main/java/com/cloud/user/Account.java | 4 -
.../main/java/com/cloud/user/AccountService.java | 5 +-
.../java/com/cloud/user/ResourceLimitService.java | 109 +-
api/src/main/java/com/cloud/user/User.java | 5 -
api/src/main/java/com/cloud/vm/NicProfile.java | 5 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 32 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 2 -
.../main/java/com/cloud/vm/VmDetailConstants.java | 1 -
.../main/java/org/apache/cloudstack/acl/Role.java | 11 -
.../org/apache/cloudstack/acl/RoleService.java | 15 +-
.../java/org/apache/cloudstack/acl/RoleType.java | 9 +-
.../cloudstack/affinity/AffinityGroupResponse.java | 13 -
.../cloudstack/api/AbstractGetUploadParamsCmd.java | 2 +
.../org/apache/cloudstack/api/ApiArgValidator.java | 5 -
.../cloudstack/api/ApiCommandResourceType.java | 3 +-
.../org/apache/cloudstack/api/ApiConstants.java | 133 +-
.../apache/cloudstack/api/ApiServerService.java | 6 -
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 2 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 18 +-
.../api/BaseListTemplateOrIsoPermissionsCmd.java | 5 +
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 16 +-
.../api/BaseUpdateTemplateOrIsoPermissionsCmd.java | 5 +
.../apache/cloudstack/api/ResponseGenerator.java | 23 +-
.../cloudstack/api/auth/APIAuthenticationType.java | 2 +-
.../command/admin/account/CreateAccountCmd.java | 2 +
.../command/admin/account/DeleteAccountCmd.java | 9 +-
.../command/admin/account/DisableAccountCmd.java | 2 +
.../command/admin/account/EnableAccountCmd.java | 2 +
.../api/command/admin/account/LockAccountCmd.java | 2 +
.../command/admin/account/UpdateAccountCmd.java | 17 +-
.../api/command/admin/acl/DisableRoleCmd.java | 69 -
.../api/command/admin/acl/EnableRoleCmd.java | 69 -
.../api/command/admin/acl/ListRolesCmd.java | 24 +-
.../cloudstack/api/command/admin/acl/RoleCmd.java | 1 -
.../admin/address/AcquirePodIpCmdByAdmin.java | 2 +
.../admin/address/AssociateIPAddrCmdByAdmin.java | 2 +
.../admin/address/ReleasePodIpCmdByAdmin.java | 2 +
.../UpdateVMAffinityGroupCmdByAdmin.java | 2 +
.../api/command/admin/alert/GenerateAlertCmd.java | 2 +
.../command/admin/autoscale/CreateCounterCmd.java | 2 +
.../command/admin/autoscale/DeleteCounterCmd.java | 6 +-
.../admin/backup/UpdateBackupOfferingCmd.java | 4 +-
.../api/command/admin/bgp/CreateASNRangeCmd.java | 83 -
.../api/command/admin/bgp/DeleteASNRangeCmd.java | 79 -
.../api/command/admin/bgp/ListASNRangesCmd.java | 79 -
.../api/command/admin/bgp/ReleaseASNumberCmd.java | 83 -
.../api/command/admin/ca/IssueCertificateCmd.java | 4 +-
.../api/command/admin/cluster/AddClusterCmd.java | 16 +-
.../command/admin/cluster/DeleteClusterCmd.java | 2 +
.../api/command/admin/cluster/ListClustersCmd.java | 2 +
.../command/admin/cluster/UpdateClusterCmd.java | 16 +-
.../command/admin/config/ListCfgGroupsByCmd.java | 2 +
.../api/command/admin/config/ListCfgsByCmd.java | 2 +
.../admin/config/ListDeploymentPlannersCmd.java | 2 +
.../config/ListHypervisorCapabilitiesCmd.java | 2 +
.../api/command/admin/config/ResetCfgCmd.java | 2 +
.../api/command/admin/config/UpdateCfgCmd.java | 2 +
.../config/UpdateHypervisorCapabilitiesCmd.java | 2 +
.../admin/diagnostics/RunDiagnosticsCmd.java | 2 +
.../ListTemplateDirectDownloadCertificatesCmd.java | 2 +
...RevokeTemplateDirectDownloadCertificateCmd.java | 2 +
...UploadTemplateDirectDownloadCertificateCmd.java | 4 +-
.../api/command/admin/domain/CreateDomainCmd.java | 2 +
.../api/command/admin/domain/DeleteDomainCmd.java | 2 +
.../admin/domain/ListDomainChildrenCmd.java | 2 +
.../api/command/admin/domain/ListDomainsCmd.java | 37 +-
.../api/command/admin/domain/UpdateDomainCmd.java | 2 +
.../api/command/admin/guest/AddGuestOsCmd.java | 2 +
.../command/admin/guest/AddGuestOsMappingCmd.java | 2 +
.../admin/guest/GetHypervisorGuestOsNamesCmd.java | 3 +
.../command/admin/guest/ListGuestOsMappingCmd.java | 2 +
.../api/command/admin/guest/RemoveGuestOsCmd.java | 2 +
.../admin/guest/RemoveGuestOsMappingCmd.java | 2 +
.../api/command/admin/guest/UpdateGuestOsCmd.java | 2 +
.../admin/guest/UpdateGuestOsMappingCmd.java | 2 +
.../api/command/admin/host/AddHostCmd.java | 4 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 4 +-
.../command/admin/host/CancelMaintenanceCmd.java | 2 +
.../api/command/admin/host/DeleteHostCmd.java | 2 +
.../admin/host/FindHostsForMigrationCmd.java | 2 +
.../api/command/admin/host/ListHostTagsCmd.java | 2 +
.../api/command/admin/host/ListHostsCmd.java | 2 +
.../admin/host/PrepareForMaintenanceCmd.java | 2 +
.../api/command/admin/host/ReconnectHostCmd.java | 2 +
.../admin/host/ReleaseHostReservationCmd.java | 2 +
.../api/command/admin/host/UpdateHostCmd.java | 7 +-
.../command/admin/host/UpdateHostPasswordCmd.java | 2 +
.../ConfigureInternalLoadBalancerElementCmd.java | 13 +-
.../CreateInternalLoadBalancerElementCmd.java | 16 +-
.../admin/internallb/ListInternalLBVMsCmd.java | 2 +
.../ListInternalLoadBalancerElementsCmd.java | 26 +-
.../admin/internallb/StartInternalLBVMCmd.java | 2 +
.../admin/internallb/StopInternalLBVMCmd.java | 2 +
.../api/command/admin/management/ListMgmtsCmd.java | 12 +-
.../command/admin/network/AddNetworkDeviceCmd.java | 2 +
.../network/AddNetworkServiceProviderCmd.java | 2 +
.../network/CreateGuestNetworkIpv6PrefixCmd.java | 2 +
.../CreateIpv4SubnetForGuestNetworkCmd.java | 108 -
.../admin/network/CreateIpv4SubnetForZoneCmd.java | 125 -
.../network/CreateManagementNetworkIpRangeCmd.java | 2 +
.../admin/network/CreateNetworkCmdByAdmin.java | 17 +-
.../admin/network/CreateNetworkOfferingCmd.java | 129 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 2 +
.../network/CreateStorageNetworkIpRangeCmd.java | 4 +-
.../admin/network/DedicateGuestVlanRangeCmd.java | 2 +
.../network/DedicateIpv4SubnetForZoneCmd.java | 111 -
.../network/DeleteGuestNetworkIpv6PrefixCmd.java | 2 +
.../DeleteIpv4SubnetForGuestNetworkCmd.java | 88 -
.../admin/network/DeleteIpv4SubnetForZoneCmd.java | 88 -
.../network/DeleteManagementNetworkIpRangeCmd.java | 8 +-
.../admin/network/DeleteNetworkDeviceCmd.java | 2 +
.../admin/network/DeleteNetworkOfferingCmd.java | 2 +
.../network/DeleteNetworkServiceProviderCmd.java | 6 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 2 +
.../network/DeleteStorageNetworkIpRangeCmd.java | 4 +-
.../network/ListDedicatedGuestVlanRangesCmd.java | 2 +
.../command/admin/network/ListGuestVlansCmd.java | 2 +
.../network/ListIpv4SubnetsForGuestNetworkCmd.java | 123 -
.../admin/network/ListIpv4SubnetsForZoneCmd.java | 120 -
.../admin/network/ListNetworkDeviceCmd.java | 2 +
.../network/ListNetworkServiceProvidersCmd.java | 2 +
.../admin/network/ListPhysicalNetworksCmd.java | 2 +
.../network/ListStorageNetworkIpRangeCmd.java | 4 +-
.../network/ListSupportedNetworkServicesCmd.java | 2 +
.../command/admin/network/MigrateNetworkCmd.java | 2 +
.../api/command/admin/network/MigrateVPCCmd.java | 2 +
.../network/ReleaseDedicatedGuestVlanRangeCmd.java | 2 +
.../ReleaseDedicatedIpv4SubnetForZoneCmd.java | 88 -
.../admin/network/UpdateIpv4SubnetForZoneCmd.java | 98 -
.../admin/network/UpdateNetworkOfferingCmd.java | 2 +
.../network/UpdateNetworkServiceProviderCmd.java | 2 +
.../admin/network/UpdatePhysicalNetworkCmd.java | 2 +
.../UpdatePodManagementNetworkIpRangeCmd.java | 6 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 4 +-
.../network/bgp/ChangeBgpPeersForNetworkCmd.java | 109 -
.../admin/network/bgp/ChangeBgpPeersForVpcCmd.java | 109 -
.../admin/network/bgp/CreateBgpPeerCmd.java | 168 --
.../admin/network/bgp/DedicateBgpPeerCmd.java | 111 -
.../admin/network/bgp/DeleteBgpPeerCmd.java | 88 -
.../command/admin/network/bgp/ListBgpPeersCmd.java | 130 -
.../network/bgp/ReleaseDedicatedBgpPeerCmd.java | 88 -
.../admin/network/bgp/UpdateBgpPeerCmd.java | 149 --
.../admin/offering/CreateDiskOfferingCmd.java | 2 +
.../admin/offering/CreateServiceOfferingCmd.java | 14 +-
.../admin/offering/DeleteDiskOfferingCmd.java | 2 +
.../admin/offering/DeleteServiceOfferingCmd.java | 2 +
...AccountAllowedToCreateOfferingsWithTagsCmd.java | 2 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 2 +
.../admin/offering/UpdateServiceOfferingCmd.java | 11 +-
.../api/command/admin/pod/CreatePodCmd.java | 2 +
.../api/command/admin/pod/DeletePodCmd.java | 2 +
.../api/command/admin/pod/ListPodsByCmd.java | 2 +
.../api/command/admin/pod/UpdatePodCmd.java | 2 +
.../api/command/admin/region/AddRegionCmd.java | 2 +
.../admin/region/CreatePortableIpRangeCmd.java | 4 +-
.../admin/region/DeletePortableIpRangeCmd.java | 2 +
.../admin/region/ListPortableIpRangesCmd.java | 2 +
.../api/command/admin/region/RemoveRegionCmd.java | 2 +
.../api/command/admin/region/UpdateRegionCmd.java | 2 +
.../command/admin/resource/ArchiveAlertsCmd.java | 2 +
.../admin/resource/CleanVMReservationsCmd.java | 2 +
.../command/admin/resource/DeleteAlertsCmd.java | 2 +
.../api/command/admin/resource/ListAlertsCmd.java | 2 +
.../command/admin/resource/ListCapacityCmd.java | 9 +-
.../admin/resource/PurgeExpungedResourcesCmd.java | 131 -
.../admin/resource/StartRollingMaintenanceCmd.java | 2 +
.../admin/resource/UploadCustomCertificateCmd.java | 2 +
.../admin/resource/icon/DeleteResourceIconCmd.java | 2 +
.../admin/resource/icon/ListResourceIconCmd.java | 2 +
.../admin/resource/icon/UploadResourceIconCmd.java | 4 +-
.../admin/router/ConfigureOvsElementCmd.java | 3 +
.../router/ConfigureVirtualRouterElementCmd.java | 2 +
.../router/CreateVirtualRouterElementCmd.java | 2 +
.../api/command/admin/router/DestroyRouterCmd.java | 2 +
.../router/GetRouterHealthCheckResultsCmd.java | 2 +
.../command/admin/router/ListOvsElementsCmd.java | 5 +-
.../api/command/admin/router/ListRoutersCmd.java | 2 +
.../admin/router/ListVirtualRouterElementsCmd.java | 2 +
.../api/command/admin/router/RebootRouterCmd.java | 2 +
.../api/command/admin/router/StartRouterCmd.java | 2 +
.../api/command/admin/router/StopRouterCmd.java | 2 +
.../api/command/admin/router/UpgradeRouterCmd.java | 2 +
.../admin/router/UpgradeRouterTemplateCmd.java | 2 +
.../command/admin/storage/AddImageStoreCmd.java | 4 +-
.../command/admin/storage/AddImageStoreS3CMD.java | 4 +-
.../admin/storage/AddObjectStoragePoolCmd.java | 4 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 2 +
.../storage/CreateSecondaryStagingStoreCmd.java | 4 +-
.../admin/storage/CreateStoragePoolCmd.java | 8 +-
.../command/admin/storage/DeleteImageStoreCmd.java | 2 +
.../admin/storage/DeleteObjectStoragePoolCmd.java | 2 +
.../api/command/admin/storage/DeletePoolCmd.java | 2 +
.../storage/DeleteSecondaryStagingStoreCmd.java | 2 +
.../storage/FindStoragePoolsForMigrationCmd.java | 2 +
.../command/admin/storage/ListImageStoresCmd.java | 2 +
.../admin/storage/ListObjectStoragePoolsCmd.java | 2 +
.../storage/ListSecondaryStagingStoresCmd.java | 2 +
.../command/admin/storage/ListStoragePoolsCmd.java | 2 +
.../admin/storage/ListStorageProvidersCmd.java | 2 +
.../command/admin/storage/ListStorageTagsCmd.java | 2 +
.../storage/MigrateSecondaryStorageDataCmd.java | 2 +
.../PreparePrimaryStorageForMaintenanceCmd.java | 2 +
.../command/admin/storage/SyncStoragePoolCmd.java | 2 +
.../storage/UpdateCloudToUseObjectStoreCmd.java | 4 +-
.../command/admin/storage/UpdateImageStoreCmd.java | 2 +
.../storage/UpdateStorageCapabilitiesCmd.java | 2 +
.../admin/storage/UpdateStoragePoolCmd.java | 16 +-
.../RemoveSecondaryStorageSelectorCmd.java | 2 +-
.../api/command/admin/swift/AddSwiftCmd.java | 4 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 2 +
.../command/admin/systemvm/DestroySystemVmCmd.java | 2 +
.../command/admin/systemvm/ListSystemVMsCmd.java | 2 +
.../command/admin/systemvm/MigrateSystemVMCmd.java | 10 +-
.../command/admin/systemvm/PatchSystemVMCmd.java | 2 +
.../command/admin/systemvm/RebootSystemVmCmd.java | 2 +
.../command/admin/systemvm/ScaleSystemVMCmd.java | 10 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 2 +
.../command/admin/systemvm/StopSystemVmCmd.java | 2 +
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 2 +
.../command/admin/template/PrepareTemplateCmd.java | 2 +
.../command/admin/usage/AddTrafficMonitorCmd.java | 2 +
.../api/command/admin/usage/AddTrafficTypeCmd.java | 2 +
.../admin/usage/DeleteTrafficMonitorCmd.java | 2 +
.../command/admin/usage/DeleteTrafficTypeCmd.java | 2 +
.../admin/usage/GenerateUsageRecordsCmd.java | 6 +-
.../admin/usage/ListTrafficMonitorsCmd.java | 2 +
.../usage/ListTrafficTypeImplementorsCmd.java | 2 +
.../command/admin/usage/ListTrafficTypesCmd.java | 2 +
.../command/admin/usage/ListUsageRecordsCmd.java | 20 +-
.../api/command/admin/usage/ListUsageTypesCmd.java | 7 +-
.../admin/usage/RemoveRawUsageRecordsCmd.java | 2 +
.../command/admin/usage/UpdateTrafficTypeCmd.java | 2 +
.../api/command/admin/user/CreateUserCmd.java | 2 +
.../api/command/admin/user/DeleteUserCmd.java | 9 +-
.../api/command/admin/user/DisableUserCmd.java | 2 +
.../api/command/admin/user/EnableUserCmd.java | 2 +
.../api/command/admin/user/GetUserCmd.java | 2 +
.../api/command/admin/user/GetUserKeysCmd.java | 11 +-
.../api/command/admin/user/ListUsersCmd.java | 18 +-
.../api/command/admin/user/LockUserCmd.java | 2 +
.../api/command/admin/user/MoveUserCmd.java | 2 +
.../api/command/admin/user/RegisterCmd.java | 2 +
.../api/command/admin/user/UpdateUserCmd.java | 12 +-
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 17 +-
.../admin/vlan/DedicatePublicIpRangeCmd.java | 2 +
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 2 +
.../command/admin/vlan/ListVlanIpRangesCmd.java | 2 +
.../admin/vlan/ReleasePublicIpRangeCmd.java | 2 +
.../command/admin/vlan/UpdateVlanIpRangeCmd.java | 4 +-
.../api/command/admin/vm/AssignVMCmd.java | 23 +-
.../api/command/admin/vm/DeployVMCmdByAdmin.java | 2 +
.../api/command/admin/vm/ExpungeVMCmd.java | 2 +
.../api/command/admin/vm/GetVMUserDataCmd.java | 2 +
.../admin/vm/ImportUnmanagedInstanceCmd.java | 14 +-
.../api/command/admin/vm/ImportVmCmd.java | 2 +
.../admin/vm/ListUnmanagedInstancesCmd.java | 2 +
.../api/command/admin/vm/ListVMsCmdByAdmin.java | 2 +
.../api/command/admin/vm/ListVmsForImportCmd.java | 2 +
.../api/command/admin/vm/MigrateVMCmd.java | 6 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 8 +-
.../api/command/admin/vm/RecoverVMCmd.java | 2 +
.../command/admin/vm/UnmanageVMInstanceCmd.java | 2 +
.../admin/volume/DestroyVolumeCmdByAdmin.java | 2 +
.../admin/volume/RecoverVolumeCmdByAdmin.java | 2 +
.../admin/vpc/CreatePrivateGatewayByAdminCmd.java | 2 +
.../api/command/admin/vpc/CreateVPCCmdByAdmin.java | 20 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 113 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 2 +
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 2 +
.../vpc/ListPrivateGatewaysCmdByAdminCmd.java | 2 +
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 2 +
.../api/command/admin/zone/CreateZoneCmd.java | 2 +
.../api/command/admin/zone/DeleteZoneCmd.java | 2 +
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 2 +
.../api/command/admin/zone/UpdateZoneCmd.java | 2 +
.../user/account/AddAccountToProjectCmd.java | 2 +
.../user/account/DeleteAccountFromProjectCmd.java | 2 +
.../user/account/DeleteUserFromProjectCmd.java | 2 +
.../api/command/user/account/ListAccountsCmd.java | 36 +-
.../user/account/ListProjectAccountsCmd.java | 2 +
.../command/user/address/AssociateIPAddrCmd.java | 8 +-
.../user/address/DisassociateIPAddrCmd.java | 2 +
.../user/address/ListPublicIpAddressesCmd.java | 10 +-
.../api/command/user/address/ReleaseIPAddrCmd.java | 2 +
.../api/command/user/address/ReserveIPAddrCmd.java | 2 +
.../api/command/user/address/UpdateIPAddrCmd.java | 2 +
.../user/affinitygroup/CreateAffinityGroupCmd.java | 2 +
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 2 +
.../affinitygroup/ListAffinityGroupTypesCmd.java | 2 +
.../user/affinitygroup/ListAffinityGroupsCmd.java | 2 +
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 2 +
.../user/autoscale/CreateAutoScalePolicyCmd.java | 2 +
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 4 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +
.../command/user/autoscale/CreateConditionCmd.java | 2 +
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 4 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 4 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 4 +-
.../command/user/autoscale/DeleteConditionCmd.java | 6 +-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 2 +
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 2 +
.../user/autoscale/ListAutoScalePoliciesCmd.java | 2 +
.../user/autoscale/ListAutoScaleVmGroupsCmd.java | 2 +
.../user/autoscale/ListAutoScaleVmProfilesCmd.java | 2 +
.../command/user/autoscale/ListConditionsCmd.java | 2 +
.../command/user/autoscale/ListCountersCmd.java | 2 +
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 2 +
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 2 +
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 2 +
.../command/user/autoscale/UpdateConditionCmd.java | 4 +-
.../user/backup/DeleteBackupScheduleCmd.java | 14 +-
.../command/user/backup/ListBackupScheduleCmd.java | 16 +-
.../api/command/user/backup/ListBackupsCmd.java | 4 +-
.../backup/repository/AddBackupRepositoryCmd.java | 137 -
.../repository/DeleteBackupRepositoryCmd.java | 76 -
.../repository/ListBackupRepositoriesCmd.java | 110 -
.../api/command/user/bgp/ListASNumbersCmd.java | 134 -
.../api/command/user/bucket/CreateBucketCmd.java | 2 +
.../api/command/user/bucket/DeleteBucketCmd.java | 2 +
.../api/command/user/bucket/ListBucketsCmd.java | 2 +
.../api/command/user/bucket/UpdateBucketCmd.java | 2 +
.../command/user/config/ListCapabilitiesCmd.java | 5 +-
.../consoleproxy/CreateConsoleEndpointCmd.java | 2 +
.../api/command/user/event/ArchiveEventsCmd.java | 2 +
.../api/command/user/event/DeleteEventsCmd.java | 2 +
.../api/command/user/event/ListEventTypesCmd.java | 2 +
.../api/command/user/event/ListEventsCmd.java | 2 +
.../user/firewall/CreateEgressFirewallRuleCmd.java | 8 +-
.../user/firewall/CreateFirewallRuleCmd.java | 30 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 4 +-
.../user/firewall/DeleteEgressFirewallRuleCmd.java | 2 +
.../user/firewall/DeleteFirewallRuleCmd.java | 2 +
.../user/firewall/DeletePortForwardingRuleCmd.java | 2 +
.../user/firewall/ListEgressFirewallRulesCmd.java | 2 +
.../user/firewall/ListFirewallRulesCmd.java | 2 +
.../user/firewall/ListPortForwardingRulesCmd.java | 2 +
.../user/firewall/UpdateEgressFirewallRuleCmd.java | 2 +
.../user/firewall/UpdateFirewallRuleCmd.java | 2 +
.../user/firewall/UpdatePortForwardingRuleCmd.java | 2 +
.../user/guest/ListGuestOsCategoriesCmd.java | 2 +
.../api/command/user/guest/ListGuestOsCmd.java | 2 +
.../user/ipv6/CreateIpv6FirewallRuleCmd.java | 6 +-
.../user/ipv6/DeleteIpv6FirewallRuleCmd.java | 2 +
.../user/ipv6/ListIpv6FirewallRulesCmd.java | 2 +
.../user/ipv6/UpdateIpv6FirewallRuleCmd.java | 2 +
.../api/command/user/iso/AttachIsoCmd.java | 2 +
.../api/command/user/iso/CopyIsoCmd.java | 2 +
.../api/command/user/iso/DeleteIsoCmd.java | 2 +
.../api/command/user/iso/DetachIsoCmd.java | 2 +
.../api/command/user/iso/ExtractIsoCmd.java | 17 +-
.../command/user/iso/GetUploadParamsForIsoCmd.java | 2 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 5 +
.../api/command/user/iso/ListIsosCmd.java | 16 +-
.../api/command/user/iso/RegisterIsoCmd.java | 16 +-
.../api/command/user/iso/UpdateIsoCmd.java | 2 +
.../command/user/iso/UpdateIsoPermissionsCmd.java | 5 +
.../command/user/job/QueryAsyncJobResultCmd.java | 2 +
.../loadbalancer/AssignCertToLoadBalancerCmd.java | 2 +
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 +
.../CreateApplicationLoadBalancerCmd.java | 10 +-
.../loadbalancer/CreateLBHealthCheckPolicyCmd.java | 4 +-
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 4 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 8 +-
.../DeleteApplicationLoadBalancerCmd.java | 2 +
.../loadbalancer/DeleteLBHealthCheckPolicyCmd.java | 2 +
.../loadbalancer/DeleteLBStickinessPolicyCmd.java | 2 +
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 2 +
.../user/loadbalancer/DeleteSslCertCmd.java | 2 +
.../ListApplicationLoadBalancersCmd.java | 2 +
.../loadbalancer/ListLBHealthCheckPoliciesCmd.java | 2 +
.../loadbalancer/ListLBStickinessPoliciesCmd.java | 2 +
.../ListLoadBalancerRuleInstancesCmd.java | 6 +-
.../loadbalancer/ListLoadBalancerRulesCmd.java | 2 +
.../command/user/loadbalancer/ListSslCertsCmd.java | 2 +
.../RemoveCertFromLoadBalancerCmd.java | 2 +
.../RemoveFromLoadBalancerRuleCmd.java | 2 +
.../UpdateApplicationLoadBalancerCmd.java | 2 +
.../loadbalancer/UpdateLBHealthCheckPolicyCmd.java | 2 +
.../loadbalancer/UpdateLBStickinessPolicyCmd.java | 2 +
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 2 +
.../user/loadbalancer/UploadSslCertCmd.java | 2 +
.../user/nat/CreateIpForwardingRuleCmd.java | 4 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 2 +
.../api/command/user/nat/DisableStaticNatCmd.java | 2 +
.../api/command/user/nat/EnableStaticNatCmd.java | 6 +-
.../command/user/nat/ListIpForwardingRulesCmd.java | 2 +
.../command/user/network/CreateNetworkACLCmd.java | 33 +-
.../user/network/CreateNetworkACLListCmd.java | 4 +-
.../api/command/user/network/CreateNetworkCmd.java | 18 +-
.../user/network/CreateNetworkPermissionsCmd.java | 2 +
.../command/user/network/DeleteNetworkACLCmd.java | 2 +
.../user/network/DeleteNetworkACLListCmd.java | 2 +
.../api/command/user/network/DeleteNetworkCmd.java | 2 +
.../user/network/ListNetworkACLListsCmd.java | 2 +
.../command/user/network/ListNetworkACLsCmd.java | 2 +
.../user/network/ListNetworkOfferingsCmd.java | 10 +-
.../user/network/ListNetworkPermissionsCmd.java | 2 +
.../user/network/ListNetworkProtocolsCmd.java | 107 -
.../api/command/user/network/ListNetworksCmd.java | 2 +
.../user/network/MoveNetworkAclItemCmd.java | 2 +
.../user/network/RemoveNetworkPermissionsCmd.java | 2 +
.../user/network/ReplaceNetworkACLListCmd.java | 2 +
.../user/network/ResetNetworkPermissionsCmd.java | 2 +
.../command/user/network/RestartNetworkCmd.java | 2 +
.../user/network/UpdateNetworkACLItemCmd.java | 2 +
.../user/network/UpdateNetworkACLListCmd.java | 2 +
.../api/command/user/network/UpdateNetworkCmd.java | 2 +
.../routing/CreateRoutingFirewallRuleCmd.java | 271 --
.../routing/DeleteRoutingFirewallRuleCmd.java | 109 -
.../routing/ListRoutingFirewallRulesCmd.java | 115 -
.../routing/UpdateRoutingFirewallRuleCmd.java | 125 -
.../user/offering/ListDiskOfferingsCmd.java | 32 +-
.../user/offering/ListServiceOfferingsCmd.java | 26 +-
.../command/user/project/ActivateProjectCmd.java | 2 +
.../api/command/user/project/CreateProjectCmd.java | 2 +
.../api/command/user/project/DeleteProjectCmd.java | 2 +
.../user/project/DeleteProjectInvitationCmd.java | 2 +
.../user/project/ListProjectInvitationsCmd.java | 2 +
.../api/command/user/project/ListProjectsCmd.java | 2 +
.../command/user/project/SuspendProjectCmd.java | 2 +
.../api/command/user/project/UpdateProjectCmd.java | 2 +
.../user/project/UpdateProjectInvitationCmd.java | 2 +
.../api/command/user/region/ListRegionsCmd.java | 2 +
.../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 2 +
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 4 +-
.../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 2 +
.../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 2 +
.../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 2 +
.../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 2 +
.../user/resource/GetCloudIdentifierCmd.java | 2 +
.../command/user/resource/ListHypervisorsCmd.java | 2 +
.../user/resource/ListResourceLimitsCmd.java | 16 +-
.../user/resource/UpdateResourceCountCmd.java | 19 +-
.../user/resource/UpdateResourceLimitCmd.java | 12 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +
.../AuthorizeSecurityGroupIngressCmd.java | 2 +
.../user/securitygroup/CreateSecurityGroupCmd.java | 2 +
.../user/securitygroup/DeleteSecurityGroupCmd.java | 4 +-
.../user/securitygroup/ListSecurityGroupsCmd.java | 2 +
.../RevokeSecurityGroupEgressCmd.java | 2 +
.../RevokeSecurityGroupIngressCmd.java | 2 +
.../user/securitygroup/UpdateSecurityGroupCmd.java | 2 +
.../command/user/snapshot/ArchiveSnapshotCmd.java | 2 +
.../api/command/user/snapshot/CopySnapshotCmd.java | 9 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 6 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 19 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 2 +
.../command/user/snapshot/DeleteSnapshotCmd.java | 2 +
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 2 +
.../command/user/snapshot/ExtractSnapshotCmd.java | 115 -
.../user/snapshot/ListSnapshotPoliciesCmd.java | 2 +
.../command/user/snapshot/ListSnapshotsCmd.java | 2 +
.../command/user/snapshot/RevertSnapshotCmd.java | 2 +
.../user/snapshot/UpdateSnapshotPolicyCmd.java | 2 +
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 2 +
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 2 +
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 2 +
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 2 +
.../sharedfs/ChangeSharedFSDiskOfferingCmd.java | 145 -
.../sharedfs/ChangeSharedFSServiceOfferingCmd.java | 147 --
.../user/storage/sharedfs/CreateSharedFSCmd.java | 304 ---
.../user/storage/sharedfs/DestroySharedFSCmd.java | 116 -
.../user/storage/sharedfs/ExpungeSharedFSCmd.java | 96 -
.../user/storage/sharedfs/ListSharedFSCmd.java | 114 -
.../storage/sharedfs/ListSharedFSProvidersCmd.java | 60 -
.../user/storage/sharedfs/RecoverSharedFSCmd.java | 83 -
.../user/storage/sharedfs/RestartSharedFSCmd.java | 145 -
.../user/storage/sharedfs/StartSharedFSCmd.java | 135 -
.../user/storage/sharedfs/StopSharedFSCmd.java | 115 -
.../user/storage/sharedfs/UpdateSharedFSCmd.java | 113 -
.../api/command/user/tag/CreateTagsCmd.java | 2 +
.../api/command/user/tag/DeleteTagsCmd.java | 2 +
.../api/command/user/template/CopyTemplateCmd.java | 4 +-
.../command/user/template/CreateTemplateCmd.java | 8 +-
.../command/user/template/DeleteTemplateCmd.java | 10 +-
.../command/user/template/ExtractTemplateCmd.java | 17 +-
.../template/GetUploadParamsForTemplateCmd.java | 14 +-
.../user/template/ListTemplatePermissionsCmd.java | 6 +
.../command/user/template/ListTemplatesCmd.java | 16 +-
.../command/user/template/RegisterTemplateCmd.java | 18 +-
.../command/user/template/UpdateTemplateCmd.java | 10 +-
.../template/UpdateTemplatePermissionsCmd.java | 5 +
.../command/user/userdata/DeleteUserDataCmd.java | 2 +
.../user/userdata/LinkUserDataToTemplateCmd.java | 2 +
.../api/command/user/userdata/ListUserDataCmd.java | 2 +
.../command/user/userdata/RegisterUserDataCmd.java | 2 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 4 +-
.../api/command/user/vm/AddNicToVMCmd.java | 2 +
.../api/command/user/vm/CreateVMScheduleCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 39 +-
.../api/command/user/vm/DestroyVMCmd.java | 2 +
.../api/command/user/vm/GetVMPasswordCmd.java | 8 +-
.../api/command/user/vm/ListNicsCmd.java | 4 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 2 +
.../api/command/user/vm/RebootVMCmd.java | 5 +-
.../api/command/user/vm/RemoveIpFromVmNicCmd.java | 4 +-
.../api/command/user/vm/RemoveNicFromVMCmd.java | 2 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 6 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 2 +
.../api/command/user/vm/ResetVMUserDataCmd.java | 2 +
.../api/command/user/vm/RestoreVMCmd.java | 7 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 10 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 20 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 2 +
.../command/user/vm/UpdateDefaultNicForVMCmd.java | 2 +
.../api/command/user/vm/UpdateVMCmd.java | 18 +-
.../api/command/user/vm/UpdateVmNicIpCmd.java | 2 +
.../api/command/user/vm/UpgradeVMCmd.java | 2 +
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 2 +
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 2 +
.../api/command/user/vmgroup/ListVMGroupsCmd.java | 2 +
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 2 +
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 +
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 2 +
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 2 +
.../command/user/volume/AddResourceDetailCmd.java | 2 +
.../api/command/user/volume/AssignVolumeCmd.java | 4 +-
.../api/command/user/volume/AttachVolumeCmd.java | 2 +
.../user/volume/CheckAndRepairVolumeCmd.java | 10 +-
.../api/command/user/volume/CreateVolumeCmd.java | 2 +
.../api/command/user/volume/DeleteVolumeCmd.java | 2 +
.../api/command/user/volume/DestroyVolumeCmd.java | 2 +
.../api/command/user/volume/DetachVolumeCmd.java | 2 +
.../api/command/user/volume/ExtractVolumeCmd.java | 26 +-
.../user/volume/GetUploadParamsForVolumeCmd.java | 4 +-
.../api/command/user/volume/ListVolumesCmd.java | 2 +
.../api/command/user/volume/RecoverVolumeCmd.java | 2 +
.../user/volume/RemoveResourceDetailCmd.java | 2 +
.../api/command/user/volume/ResizeVolumeCmd.java | 22 +-
.../api/command/user/volume/UpdateVolumeCmd.java | 16 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +
.../command/user/vpc/CreatePrivateGatewayCmd.java | 8 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 6 +-
.../api/command/user/vpc/CreateVPCCmd.java | 30 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 2 +
.../api/command/user/vpc/DeleteVPCCmd.java | 6 +-
.../command/user/vpc/ListPrivateGatewaysCmd.java | 2 +
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 2 +
.../api/command/user/vpc/ListVPCsCmd.java | 2 +
.../api/command/user/vpc/RestartVPCCmd.java | 10 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 8 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 2 +
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 8 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 8 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 2 +
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +
.../command/user/vpn/DeleteVpnConnectionCmd.java | 4 +-
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 2 +
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 2 +
.../command/user/vpn/ListRemoteAccessVpnsCmd.java | 2 +
.../command/user/vpn/ListVpnConnectionsCmd.java | 2 +
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 2 +
.../api/command/user/vpn/ListVpnGatewaysCmd.java | 2 +
.../api/command/user/vpn/ListVpnUsersCmd.java | 2 +
.../api/command/user/vpn/RemoveVpnUserCmd.java | 10 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 4 +-
.../command/user/vpn/UpdateRemoteAccessVpnCmd.java | 2 +
.../command/user/vpn/UpdateVpnConnectionCmd.java | 2 +
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +
.../api/command/user/vpn/UpdateVpnGatewayCmd.java | 2 +
.../api/command/user/zone/ListZonesCmd.java | 2 +
.../cloudstack/api/response/ASNRangeResponse.java | 93 -
.../cloudstack/api/response/ASNumberResponse.java | 237 --
.../cloudstack/api/response/AccountResponse.java | 17 -
.../api/response/AcquirePodIpCmdResponse.java | 10 +-
.../api/response/BackupRepositoryResponse.java | 142 -
.../cloudstack/api/response/BgpPeerResponse.java | 200 --
.../cloudstack/api/response/BucketResponse.java | 2 +-
.../api/response/CapabilitiesResponse.java | 24 -
.../cloudstack/api/response/CapacityResponse.java | 11 +-
.../cloudstack/api/response/ClusterResponse.java | 12 -
.../api/response/DataCenterIpv4SubnetResponse.java | 151 --
.../api/response/DiskOfferingResponse.java | 8 -
.../cloudstack/api/response/DomainResponse.java | 10 -
.../cloudstack/api/response/HostResponse.java | 36 -
.../cloudstack/api/response/HostTagResponse.java | 13 -
.../cloudstack/api/response/IPAddressResponse.java | 8 -
.../cloudstack/api/response/Ipv4RouteResponse.java | 59 -
.../Ipv4SubnetForGuestNetworkResponse.java | 199 --
.../api/response/ManagementServerResponse.java | 33 +-
.../api/response/NetworkOfferingResponse.java | 48 -
.../api/response/NetworkProtocolResponse.java | 89 -
.../cloudstack/api/response/NetworkResponse.java | 54 +-
.../response/PeerManagementServerNodeResponse.java | 100 -
.../cloudstack/api/response/ProjectResponse.java | 9 -
.../response/PurgeExpungedResourcesResponse.java | 39 -
.../cloudstack/api/response/RegisterResponse.java | 13 +-
.../api/response/ResourceCountResponse.java | 16 +-
.../response/ResourceLimitAndCountResponse.java | 4 -
.../api/response/ResourceLimitResponse.java | 13 +-
.../cloudstack/api/response/RoleResponse.java | 8 -
.../api/response/ServiceOfferingResponse.java | 8 -
.../api/response/SharedFSProviderResponse.java | 38 -
.../cloudstack/api/response/SharedFSResponse.java | 369 ---
.../api/response/StoragePoolResponse.java | 12 -
.../TaggedResourceLimitAndCountResponse.java | 86 -
.../cloudstack/api/response/TemplateResponse.java | 8 -
.../api/response/UsageRecordResponse.java | 11 +-
.../cloudstack/api/response/UsageTypeResponse.java | 14 +-
.../cloudstack/api/response/UserResponse.java | 8 -
.../cloudstack/api/response/UserVmResponse.java | 24 -
.../api/response/VlanIpRangeResponse.java | 8 -
.../cloudstack/api/response/VolumeResponse.java | 18 +-
.../api/response/VpcOfferingResponse.java | 42 +-
.../cloudstack/api/response/VpcResponse.java | 52 -
.../cloudstack/api/response/ZoneResponse.java | 61 +-
.../java/org/apache/cloudstack/backup/Backup.java | 2 -
.../apache/cloudstack/backup/BackupManager.java | 7 +-
.../apache/cloudstack/backup/BackupProvider.java | 2 +-
.../apache/cloudstack/backup/BackupRepository.java | 34 -
.../cloudstack/backup/BackupRepositoryService.java | 34 -
.../cloudstack/cluster/ClusterDrsAlgorithm.java | 7 +-
.../consoleproxy/ConsoleAccessManager.java | 4 -
.../org/apache/cloudstack/context/CallContext.java | 25 +-
.../org/apache/cloudstack/context/LogContext.java | 21 +-
.../datacenter/DataCenterIpv4GuestSubnet.java | 36 -
.../dedicated/DedicatedResourceResponse.java | 44 -
.../org/apache/cloudstack/network/BgpPeer.java | 50 -
.../org/apache/cloudstack/network/BgpPeerTO.java | 91 -
.../network/Ipv4GuestSubnetNetworkMap.java | 47 -
.../cloudstack/network/RoutedIpv4Manager.java | 208 --
.../InternalLoadBalancerElementService.java | 2 -
.../OutOfBandManagementService.java | 2 +-
.../org/apache/cloudstack/query/QueryService.java | 3 +-
.../resource/ResourceCleanupService.java | 74 -
.../storage/browser/DataStoreObjectResponse.java | 36 -
.../cloudstack/storage/sharedfs/SharedFS.java | 189 --
.../storage/sharedfs/SharedFSLifeCycle.java | 43 -
.../storage/sharedfs/SharedFSProvider.java | 30 -
.../storage/sharedfs/SharedFSService.java | 72 -
.../org/apache/cloudstack/usage/UsageService.java | 3 +
.../org/apache/cloudstack/usage/UsageTypes.java | 50 +-
.../cloudstack/user/ResourceReservation.java | 11 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 26 +-
.../api-config/spring-api-config-context.xml | 2 +-
.../api-planner/spring-api-planner-context.xml | 2 +-
.../com/cloud/agent/api/to/LoadBalancerTOTest.java | 20 +-
.../test/java/com/cloud/storage/StorageTest.java | 9 -
.../admin/account/CreateAccountCmdTest.java | 5 +-
.../command/admin/bgp/CreateASNRangeCmdTest.java | 69 -
.../command/admin/bgp/DeleteASNRangeCmdTest.java | 55 -
.../command/admin/bgp/ListASNRangesCmdTest.java | 75 -
.../command/admin/bgp/ReleaseASNumberCmdTest.java | 61 -
.../command/admin/domain/ListDomainsCmdTest.java | 88 -
.../CreateIpv4SubnetForGuestNetworkCmdTest.java | 69 -
.../network/CreateIpv4SubnetForZoneCmdTest.java | 75 -
.../network/DedicateIpv4SubnetForZoneCmdTest.java | 72 -
.../DeleteIpv4SubnetForGuestNetworkCmdTest.java | 58 -
.../network/DeleteIpv4SubnetForZoneCmdTest.java | 58 -
.../ListIpv4SubnetsForGuestNetworkCmdTest.java | 83 -
.../network/ListIpv4SubnetsForZoneCmdTest.java | 83 -
.../ReleaseDedicatedIpv4SubnetForZoneCmdTest.java | 62 -
.../network/UpdateIpv4SubnetForZoneCmdTest.java | 66 -
.../bgp/ChangeBgpPeersForNetworkCmdTest.java | 74 -
.../network/bgp/ChangeBgpPeersForVpcCmdTest.java | 74 -
.../admin/network/bgp/CreateBgpPeerCmdTest.java | 85 -
.../admin/network/bgp/DedicateBgpPeerCmdTest.java | 72 -
.../admin/network/bgp/DeleteBgpPeerCmdTest.java | 58 -
.../admin/network/bgp/ListBgpPeersCmdTest.java | 96 -
.../bgp/ReleaseDedicatedBgpPeerCmdTest.java | 62 -
.../admin/network/bgp/UpdateBgpPeerCmdTest.java | 87 -
.../offering/CreateNetworkOfferingCmdTest.java | 4 +-
.../offering/CreateServiceOfferingCmdTest.java | 20 +-
.../offering/UpdateServiceOfferingCmdTest.java | 51 -
.../admin/resource/ListCapacityCmdTest.java | 34 -
.../resource/PurgeExpungedResourcesCmdTest.java | 104 -
.../admin/storage/AddObjectStoragePoolCmdTest.java | 13 +-
.../storage/DeleteObjectStoragePoolCmdTest.java | 7 +-
.../FindStoragePoolsForMigrationCmdTest.java | 2 +-
.../storage/UpdateObjectStoragePoolCmdTest.java | 11 +-
.../api/command/admin/user/CreateUserCmdTest.java | 5 +-
.../command/admin/vpc/CreateVPCCmdByAdminTest.java | 55 -
.../admin/vpc/CreateVPCOfferingCmdTest.java | 6 +-
.../api/command/test/ActivateProjectCmdTest.java | 8 +-
.../command/test/AddAccountToProjectCmdTest.java | 6 +-
.../api/command/test/AddIpToVmNicTest.java | 10 +-
.../test/AddNetworkServiceProviderCmdTest.java | 6 +-
.../command/test/AddSecondaryStorageCmdTest.java | 4 +-
.../api/command/test/CreateRoleCmdTest.java | 2 -
.../api/command/test/CreateSnapshotCmdTest.java | 10 +-
.../api/command/test/ImportRoleCmdTest.java | 7 +-
.../api/command/test/UpdateRoleCmdTest.java | 1 -
.../command/user/account/ListAccountsCmdTest.java | 87 -
.../api/command/user/bgp/ListASNumbersCmdTest.java | 97 -
.../api/command/user/iso/RegisterIsoCmdTest.java | 2 +-
.../user/network/ListNetworkProtocolsCmdTest.java | 95 -
.../routing/CreateRoutingFirewallRuleCmdTest.java | 251 --
.../routing/DeleteRoutingFirewallRuleCmdTest.java | 83 -
.../routing/ListRoutingFirewallRulesCmdTest.java | 115 -
.../routing/UpdateRoutingFirewallRuleCmdTest.java | 106 -
.../user/offering/ListDiskOfferingsCmdTest.java | 37 -
.../user/offering/ListServiceOfferingsCmdTest.java | 38 -
.../command/user/project/CreateProjectCmdTest.java | 2 +-
.../user/resource/ListResourceLimitsCmdTest.java | 37 -
.../user/resource/UpdateResourceCountCmdTest.java | 37 -
.../user/resource/UpdateResourceLimitCmdTest.java | 37 -
.../user/template/CopyTemplateCmdByAdminTest.java | 2 +-
.../command/user/template/CopyTemplateCmdTest.java | 2 +-
.../template/RegisterTemplateCmdByAdminTest.java | 2 +-
.../user/template/RegisterTemplateCmdTest.java | 2 +-
.../user/template/UpdateTemplateCmdTest.java | 49 -
.../command/user/vm/CreateVMScheduleCmdTest.java | 22 +-
.../command/user/vm/DeleteVMScheduleCmdTest.java | 22 +-
.../api/command/user/vm/ListVMScheduleCmdTest.java | 19 +-
.../command/user/vm/UpdateVMScheduleCmdTest.java | 22 +-
.../api/command/user/vpc/CreateVPCCmdTest.java | 14 -
.../api/response/ASNRangeResponseTest.java | 51 -
.../api/response/ASNumberResponseTest.java | 92 -
.../api/response/BgpPeerResponseTest.java | 81 -
.../response/DataCenterIpv4SubnetResponseTest.java | 66 -
.../api/response/Ipv4RouteResponseTest.java | 48 -
.../Ipv4SubnetForGuestNetworkResponseTest.java | 81 -
.../apache/cloudstack/context/CallContextTest.java | 2 +-
.../apache/cloudstack/network/BgpPeerTOTest.java | 67 -
.../org.mockito.plugins.MockMaker | 1 +
build/replace.properties | 4 +-
client/bindir/cloud-setup-management.in | 14 -
client/bindir/cloud-update-xenserver-licenses.in | 18 +-
client/conf/db.properties.in | 20 +-
client/conf/log4j-cloud.xml.in | 295 ++-
client/pom.xml | 29 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 17 +-
.../META-INF/cloudstack/webApplicationContext.xml | 2 +-
client/src/main/webapp/WEB-INF/web.xml | 2 +-
core/pom.xml | 2 +-
.../com/cloud/agent/api/ConvertInstanceAnswer.java | 16 -
.../cloud/agent/api/ConvertInstanceCommand.java | 11 +-
.../com/cloud/agent/api/GetStorageStatsAnswer.java | 36 +-
.../java/com/cloud/agent/api/ReadyCommand.java | 29 +-
.../com/cloud/agent/api/SecurityGroupRulesCmd.java | 4 +-
.../cloud/agent/api/SetupGuestNetworkCommand.java | 9 -
.../java/com/cloud/agent/api/StartupAnswer.java | 14 +-
.../java/com/cloud/agent/api/StartupCommand.java | 9 -
.../com/cloud/agent/api/StartupRoutingCommand.java | 13 -
.../cloud/agent/api/routing/SetBgpPeersAnswer.java | 46 -
.../agent/api/routing/SetBgpPeersCommand.java | 39 -
.../agent/resource/virtualnetwork/VRScripts.java | 1 -
.../virtualnetwork/VirtualRoutingResource.java | 73 +-
.../facade/AbstractConfigItemFacade.java | 11 +-
.../facade/SetBgpPeersConfigItem.java | 46 -
.../facade/SetGuestNetworkConfigItem.java | 1 -
.../facade/SetMonitorServiceConfigItem.java | 6 +-
.../facade/SetNetworkAclConfigItem.java | 4 +-
.../resource/virtualnetwork/model/BgpPeers.java | 45 -
.../resource/virtualnetwork/model/ConfigBase.java | 1 -
.../virtualnetwork/model/GuestNetwork.java | 9 -
.../agent/transport/LoggingExclusionStrategy.java | 17 +-
.../java/com/cloud/agent/transport/Request.java | 31 +-
.../agent/transport/StoragePoolTypeAdaptor.java | 53 -
.../com/cloud/network/HAProxyConfigurator.java | 23 +-
.../network/resource/TrafficSentinelResource.java | 11 +-
.../java/com/cloud/resource/CommandWrapper.java | 5 +-
.../java/com/cloud/resource/RequestWrapper.java | 9 +-
.../java/com/cloud/resource/ServerResource.java | 8 -
.../com/cloud/resource/ServerResourceBase.java | 39 +-
.../main/java/com/cloud/serializer/GsonHelper.java | 27 +-
.../java/com/cloud/storage/JavaStorageLayer.java | 9 +-
.../StorageSubsystemCommandHandlerBase.java | 11 +-
.../storage/template/FtpTemplateUploader.java | 15 +-
.../storage/template/HttpTemplateDownloader.java | 28 +-
.../com/cloud/storage/template/IsoProcessor.java | 6 +-
.../storage/template/LocalTemplateDownloader.java | 18 +-
.../template/MetalinkTemplateDownloader.java | 14 +-
.../com/cloud/storage/template/OVAProcessor.java | 64 +-
.../com/cloud/storage/template/QCOW2Processor.java | 10 +-
.../cloud/storage/template/RawImageProcessor.java | 8 +-
.../storage/template/S3TemplateDownloader.java | 26 +-
.../storage/template/ScpTemplateDownloader.java | 8 +-
.../template/SimpleHttpMultiFileDownloader.java | 22 +-
.../com/cloud/storage/template/TARProcessor.java | 6 +-
.../storage/template/TemplateDownloaderBase.java | 4 +-
.../cloud/storage/template/TemplateLocation.java | 41 +-
.../com/cloud/storage/template/VhdProcessor.java | 18 +-
.../com/cloud/storage/template/VmdkProcessor.java | 20 +-
.../org/apache/cloudstack/backup/BackupAnswer.java | 59 -
.../cloudstack/backup/DeleteBackupCommand.java | 76 -
.../cloudstack/backup/RestoreBackupCommand.java | 130 -
.../cloudstack/backup/TakeBackupCommand.java | 94 -
.../cloudstack/diagnostics/DiagnosticsAnswer.java | 2 +
.../direct/download/DirectDownloadHelper.java | 5 +-
.../download/DirectTemplateDownloaderImpl.java | 17 +-
.../download/HttpDirectTemplateDownloader.java | 18 +-
.../download/HttpsDirectTemplateDownloader.java | 18 +-
.../download/MetalinkDirectTemplateDownloader.java | 19 +-
.../download/NfsDirectTemplateDownloader.java | 2 +-
.../apache/cloudstack/storage/to/ImageStoreTO.java | 13 +-
.../cloudstack/storage/to/PrimaryDataStoreTO.java | 13 +-
.../cloudstack/storage/to/TemplateObjectTO.java | 5 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 5 +-
.../transport/HypervisorTypeAdaptor.java | 53 -
.../allocator/spring-core-allocator-context.xml | 2 +-
...ore-lifecycle-allocator-context-inheritable.xml | 2 +-
...ring-core-lifecycle-api-context-inheritable.xml | 4 +-
.../core/spring-core-registry-core-context.xml | 26 +-
.../META-INF/cloudstack/event/module.properties | 21 -
...ng-core-lifecycle-event-context-inheritable.xml | 31 -
...-core-lifecycle-network-context-inheritable.xml | 7 +-
...pring-lifecycle-storage-context-inheritable.xml | 10 +-
.../spring-core-system-context-inheritable.xml | 10 +-
.../system/spring-core-system-context.xml | 6 +-
.../cloud/agent/api/GetStorageStatsAnswerTest.java | 81 -
.../cloud/agent/api/SecurityGroupRulesCmdTest.java | 2 +-
.../agent/api/routing/SetBgpPeersAnswerTest.java | 54 -
.../agent/api/routing/SetBgpPeersCommandTest.java | 47 -
.../facade/SetBgpPeersConfigItemTest.java | 56 -
.../virtualnetwork/model/BgpPeersTest.java | 56 -
.../transport/LoggingExclusionStrategyTest.java | 83 -
.../com/cloud/agent/transport/RequestTest.java | 95 +-
.../java/com/cloud/serializer/GsonHelperTest.java | 81 -
.../cloud/storage/template/OVAProcessorTest.java | 20 -
.../api/agent/test/CheckOnHostCommandTest.java | 8 +-
.../download/BaseDirectTemplateDownloaderTest.java | 10 +-
.../org.mockito.plugins.MockMaker | 1 +
debian/changelog | 24 +-
debian/cloudstack-management.postinst | 2 +-
debian/control | 10 +-
debian/rules | 7 +-
deps/install-non-oss.sh | 43 +-
developer/pom.xml | 67 +-
engine/api/pom.xml | 4 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 39 +-
.../service/NetworkOrchestrationService.java | 10 +-
.../service/VolumeOrchestrationService.java | 3 +-
.../engine/subsystem/api/storage/EndPoint.java | 2 -
.../api/storage/HypervisorHostListener.java | 10 -
.../api/storage/PrimaryDataStoreDriver.java | 30 -
.../engine/subsystem/api/storage/TemplateInfo.java | 2 -
.../subsystem/api/storage/TemplateService.java | 3 +-
.../storage/object/ObjectStoreEntity.java | 15 +-
.../core/spring-engine-api-core-context.xml | 2 +-
engine/components-api/pom.xml | 2 +-
.../main/java/com/cloud/agent/AgentManager.java | 4 -
.../src/main/java/com/cloud/agent/Listener.java | 8 -
.../main/java/com/cloud/alert/AlertManager.java | 6 +-
.../java/com/cloud/capacity/CapacityManager.java | 27 +-
.../cloud/configuration/ConfigurationManager.java | 39 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 23 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 26 +-
.../java/com/cloud/network/IpAddressManager.java | 5 +-
.../com/cloud/network/NetworkStateListener.java | 35 +-
.../main/java/com/cloud/network/addr/PublicIp.java | 7 -
.../network/lb/LoadBalancingRulesManager.java | 4 +-
.../com/cloud/network/rules/FirewallManager.java | 6 +-
.../java/com/cloud/network/rules/RulesManager.java | 5 +-
.../network/security/SecurityGroupManager.java | 5 +-
.../com/cloud/network/vpc/NetworkACLManager.java | 3 -
.../java/com/cloud/network/vpc/VpcManager.java | 11 +-
.../java/com/cloud/resource/ResourceManager.java | 6 +-
.../java/com/cloud/storage/StorageManager.java | 25 +-
.../main/java/com/cloud/storage/StorageUtil.java | 2 +-
.../java/com/cloud/template/TemplateManager.java | 13 +-
.../src/main/java/com/cloud/vm/VmWork.java | 4 -
.../java/com/cloud/vm/VmWorkJobHandlerProxy.java | 25 +-
.../com/cloud/vm/snapshot/VMSnapshotManager.java | 2 +-
.../cloud/network/NetworkStateListenerTest.java | 40 -
engine/orchestration/pom.xml | 2 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 107 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 591 ++---
.../cloud/agent/manager/ClusteredAgentAttache.java | 50 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 396 +--
.../agent/manager/ClusteredDirectAgentAttache.java | 8 +-
.../cloud/agent/manager/ConnectedAgentAttache.java | 10 +-
.../cloud/agent/manager/DirectAgentAttache.java | 87 +-
.../java/com/cloud/agent/manager/DummyAttache.java | 4 +-
.../cloud/agent/manager/SynchronousListener.java | 14 +-
.../cluster/agentlb/AgentLoadBalancerPlanner.java | 3 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 29 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 1269 +++++----
.../com/cloud/vm/VirtualMachinePowerStateSync.java | 5 +-
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 237 +-
.../java/com/cloud/vm/VmWorkJobDispatcher.java | 24 +-
.../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 17 +-
.../src/main/java/com/cloud/vm/VmWorkStart.java | 4 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 9 +-
.../entity/api/DataCenterResourceManagerImpl.java | 2 +-
.../datacenter/entity/api/db/EngineClusterVO.java | 26 -
.../entity/api/db/EngineDataCenterVO.java | 8 -
.../datacenter/entity/api/db/EngineHostPodVO.java | 8 -
.../datacenter/entity/api/db/EngineHostVO.java | 26 +-
.../entity/api/db/dao/EngineClusterDaoImpl.java | 6 +-
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 8 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 6 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 8 +-
.../engine/orchestration/DataMigrationUtility.java | 43 +-
.../engine/orchestration/NetworkOrchestrator.java | 774 +++---
.../engine/orchestration/StorageOrchestrator.java | 29 +-
.../engine/orchestration/VolumeOrchestrator.java | 303 +--
.../spring-engine-orchestration-core-context.xml | 14 +-
.../cloud/agent/manager/AgentManagerImplTest.java | 22 +-
.../agent/manager/ConnectedAgentAttacheTest.java | 16 +-
.../agent/manager/DirectAgentAttacheTest.java | 8 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 229 +-
.../vm/VirtualMachinePowerStateSyncImplTest.java | 107 -
.../orchestration/DataMigrationUtilityTest.java | 88 -
.../orchestration/NetworkOrchestratorTest.java | 7 +-
.../engine/provisioning/test/ProvisioningTest.java | 5 +-
.../org.mockito.plugins.MockMaker | 1 +
engine/pom.xml | 2 +-
engine/schema/pom.xml | 81 +-
.../main/java/com/cloud/capacity/CapacityVO.java | 12 -
.../java/com/cloud/capacity/dao/CapacityDao.java | 7 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 88 +-
.../cloud/certificate/dao/CertificateDaoImpl.java | 4 +-
.../agentlb/dao/HostTransferMapDaoImpl.java | 2 +
.../com/cloud/configuration/ResourceCountVO.java | 23 +-
.../com/cloud/configuration/ResourceLimitVO.java | 18 +-
.../cloud/configuration/dao/ResourceCountDao.java | 27 +-
.../configuration/dao/ResourceCountDaoImpl.java | 170 +-
.../cloud/configuration/dao/ResourceLimitDao.java | 4 +-
.../configuration/dao/ResourceLimitDaoImpl.java | 61 +-
.../main/java/com/cloud/dc/ASNumberRangeVO.java | 104 -
.../src/main/java/com/cloud/dc/ASNumberVO.java | 178 --
.../main/java/com/cloud/dc/ClusterDetailsDao.java | 3 -
.../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 27 +-
.../src/main/java/com/cloud/dc/ClusterVO.java | 18 -
.../java/com/cloud/dc/DataCenterIpAddressVO.java | 10 +-
.../src/main/java/com/cloud/dc/HostPodVO.java | 8 -
.../schema/src/main/java/com/cloud/dc/VlanVO.java | 24 +-
.../main/java/com/cloud/dc/VmwareDatacenterVO.java | 5 +-
.../main/java/com/cloud/dc/dao/ASNumberDao.java | 41 -
.../java/com/cloud/dc/dao/ASNumberDaoImpl.java | 141 -
.../java/com/cloud/dc/dao/ASNumberRangeDao.java | 27 -
.../com/cloud/dc/dao/ASNumberRangeDaoImpl.java | 42 -
.../src/main/java/com/cloud/dc/dao/ClusterDao.java | 21 +-
.../main/java/com/cloud/dc/dao/ClusterDaoImpl.java | 99 +-
.../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 22 +-
.../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 7 +-
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 43 +-
.../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 6 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 2 +-
.../main/java/com/cloud/dc/dao/HostPodDaoImpl.java | 4 +-
.../cloud/dc/dao/VsphereStoragePolicyDaoImpl.java | 2 +
.../src/main/java/com/cloud/domain/DomainVO.java | 10 +-
.../java/com/cloud/domain/dao/DomainDaoImpl.java | 22 +-
.../com/cloud/domain/dao/DomainDetailsDaoImpl.java | 14 +-
.../java/com/cloud/event/dao/EventDaoImpl.java | 2 +
.../com/cloud/event/dao/UsageEventDaoImpl.java | 20 +-
.../cloud/event/dao/UsageEventDetailsDaoImpl.java | 2 +
.../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 2 +
.../java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 2 +
.../src/main/java/com/cloud/host/HostTagVO.java | 10 -
.../src/main/java/com/cloud/host/HostVO.java | 84 +-
.../src/main/java/com/cloud/host/dao/HostDao.java | 50 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 490 ++--
.../main/java/com/cloud/host/dao/HostTagsDao.java | 8 -
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 125 -
.../cloud/hypervisor/HypervisorCapabilitiesVO.java | 6 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 6 +-
.../vmware/dao/VmwareDatacenterDaoImpl.java | 3 +-
.../com/cloud/network/LBHealthCheckPolicyVO.java | 8 -
.../com/cloud/network/as/AutoScalePolicyVO.java | 5 +-
.../com/cloud/network/as/AutoScaleVmGroupVO.java | 9 +-
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 5 +-
.../java/com/cloud/network/as/ConditionVO.java | 5 +-
.../main/java/com/cloud/network/as/CounterVO.java | 5 +-
.../network/as/dao/AutoScaleVmGroupVmMapDao.java | 2 -
.../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 18 +-
.../network/dao/ExternalLoadBalancerDeviceVO.java | 8 -
.../network/dao/FirewallRulesCidrsDaoImpl.java | 4 +-
.../com/cloud/network/dao/FirewallRulesDao.java | 2 -
.../cloud/network/dao/FirewallRulesDaoImpl.java | 16 -
.../java/com/cloud/network/dao/IPAddressDao.java | 2 -
.../com/cloud/network/dao/IPAddressDaoImpl.java | 19 +-
.../java/com/cloud/network/dao/IPAddressVO.java | 5 +-
.../network/dao/InlineLoadBalancerNicMapDao.java | 4 -
.../dao/InlineLoadBalancerNicMapDaoImpl.java | 15 -
.../cloud/network/dao/LBStickinessPolicyVO.java | 8 -
.../cloud/network/dao/LoadBalancerVMMapDao.java | 1 -
.../network/dao/LoadBalancerVMMapDaoImpl.java | 15 +-
.../java/com/cloud/network/dao/LoadBalancerVO.java | 8 -
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 3 +-
.../cloud/network/dao/NetworkDomainDaoImpl.java | 2 +
.../cloud/network/dao/NetworkServiceMapDao.java | 2 -
.../network/dao/NetworkServiceMapDaoImpl.java | 22 -
.../main/java/com/cloud/network/dao/NetworkVO.java | 20 +-
.../java/com/cloud/network/dao/NsxProviderDao.java | 30 -
.../com/cloud/network/dao/NsxProviderDaoImpl.java | 65 -
.../network/dao/OpRouterMonitorServiceDao.java | 4 -
.../network/dao/OpRouterMonitorServiceDaoImpl.java | 19 +-
.../dao/PhysicalNetworkServiceProviderVO.java | 8 -
.../com/cloud/network/dao/PhysicalNetworkVO.java | 8 -
.../com/cloud/network/dao/PortProfileDaoImpl.java | 2 +
.../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 2 +
.../com/cloud/network/dao/RemoteAccessVpnVO.java | 6 -
.../dao/RouterHealthCheckResultDaoImpl.java | 4 +-
.../network/dao/Site2SiteCustomerGatewayVO.java | 8 -
.../network/dao/Site2SiteVpnConnectionDaoImpl.java | 2 +
.../network/dao/Site2SiteVpnConnectionVO.java | 8 -
.../network/dao/Site2SiteVpnGatewayDaoImpl.java | 2 +
.../cloud/network/dao/Site2SiteVpnGatewayVO.java | 8 -
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 +
.../com/cloud/network/element/NsxProviderVO.java | 285 --
.../com/cloud/network/rules/FirewallRuleVO.java | 5 +-
.../cloud/network/rules/PortForwardingRuleVO.java | 10 -
.../network/rules/dao/PortForwardingRulesDao.java | 1 -
.../rules/dao/PortForwardingRulesDaoImpl.java | 18 +-
.../network/security/SecurityGroupRuleVO.java | 9 -
.../cloud/network/security/SecurityGroupVO.java | 9 -
.../security/dao/SecurityGroupWorkDaoImpl.java | 10 +-
.../network/security/dao/VmRulesetLogDaoImpl.java | 26 +-
.../com/cloud/network/vpc/NetworkACLItemVO.java | 5 +-
.../java/com/cloud/network/vpc/NetworkACLVO.java | 2 +-
.../java/com/cloud/network/vpc/VpcGatewayVO.java | 7 +-
.../java/com/cloud/network/vpc/VpcOfferingVO.java | 53 +-
.../src/main/java/com/cloud/network/vpc/VpcVO.java | 10 +-
.../vpc/dao/NetworkACLItemCidrsDaoImpl.java | 2 +
.../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 6 +-
.../com/cloud/network/vpc/dao/VpcOfferingDao.java | 2 -
.../cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 6 -
.../com/cloud/offerings/NetworkOfferingVO.java | 53 +-
.../cloud/offerings/dao/NetworkOfferingDao.java | 2 -
.../offerings/dao/NetworkOfferingDaoImpl.java | 5 -
.../com/cloud/projects/ProjectInvitationVO.java | 7 +-
.../main/java/com/cloud/projects/ProjectVO.java | 4 +-
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 6 +-
.../com/cloud/projects/dao/ProjectDaoImpl.java | 2 +
.../projects/dao/ProjectInvitationDaoImpl.java | 8 +-
.../resource/icon/dao/ResourceIconDaoImpl.java | 2 +
.../com/cloud/secstorage/CommandExecLogDao.java | 2 -
.../cloud/secstorage/CommandExecLogDaoImpl.java | 16 +-
.../com/cloud/service/dao/ServiceOfferingDao.java | 2 -
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 25 +-
.../src/main/java/com/cloud/storage/BucketVO.java | 22 +-
.../java/com/cloud/storage/DiskOfferingVO.java | 8 -
.../com/cloud/storage/GuestOSHypervisorVO.java | 3 -
.../java/com/cloud/storage/SnapshotPolicyVO.java | 8 -
.../java/com/cloud/storage/SnapshotScheduleVO.java | 8 -
.../main/java/com/cloud/storage/SnapshotVO.java | 12 +-
.../main/java/com/cloud/storage/VMTemplateVO.java | 26 +-
.../src/main/java/com/cloud/storage/VolumeVO.java | 83 +-
.../java/com/cloud/storage/dao/BucketDaoImpl.java | 2 +
.../com/cloud/storage/dao/DiskOfferingDao.java | 1 -
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 18 -
.../storage/dao/GuestOSHypervisorDaoImpl.java | 10 +-
.../cloud/storage/dao/LaunchPermissionDaoImpl.java | 6 +-
.../java/com/cloud/storage/dao/SnapshotDao.java | 1 -
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 18 +-
.../com/cloud/storage/dao/SnapshotScheduleDao.java | 6 +-
.../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 35 +-
.../com/cloud/storage/dao/SnapshotZoneDaoImpl.java | 2 +
.../storage/dao/StoragePoolDetailsDaoImpl.java | 11 +-
.../com/cloud/storage/dao/StoragePoolHostDao.java | 2 +-
.../cloud/storage/dao/StoragePoolHostDaoImpl.java | 36 +-
.../com/cloud/storage/dao/StoragePoolTagsDao.java | 1 -
.../cloud/storage/dao/StoragePoolTagsDaoImpl.java | 18 +-
.../java/com/cloud/storage/dao/UploadDaoImpl.java | 2 +
.../java/com/cloud/storage/dao/VMTemplateDao.java | 4 -
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 74 +-
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 16 +-
.../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 2 +
.../main/java/com/cloud/storage/dao/VolumeDao.java | 4 -
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 98 +-
.../com/cloud/storage/dao/VolumeStatsDaoImpl.java | 14 +-
.../upgrade/ConfigurationGroupsAggregator.java | 5 +-
.../java/com/cloud/upgrade/DatabaseCreator.java | 10 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 42 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 67 +-
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 49 +-
.../com/cloud/upgrade/RolePermissionChecker.java | 9 +-
.../upgrade/SystemVmTemplateRegistration.java | 14 +-
.../cloud/upgrade/dao/DatabaseAccessObject.java | 46 +-
.../cloud/upgrade/dao/DbUpgradeAbstractImpl.java | 24 -
.../java/com/cloud/upgrade/dao/DbUpgradeUtils.java | 6 -
.../com/cloud/upgrade/dao/LegacyDbUpgrade.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade217to218.java | 2 +-
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 132 +-
.../upgrade/dao/Upgrade218to224DomainVlans.java | 12 +-
.../cloud/upgrade/dao/Upgrade218to22Premium.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade2210to2211.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade2211to2212.java | 10 +-
.../upgrade/dao/Upgrade2211to2212Premium.java | 2 +
.../com/cloud/upgrade/dao/Upgrade2212to2213.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade2213to2214.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 96 +-
.../com/cloud/upgrade/dao/Upgrade221to222.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade222to224.java | 46 +-
.../cloud/upgrade/dao/Upgrade222to224Premium.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade224to225.java | 24 +-
.../com/cloud/upgrade/dao/Upgrade225to226.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade227to228.java | 20 +-
.../cloud/upgrade/dao/Upgrade227to228Premium.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade228to229.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade229to2210.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade301to302.java | 14 +-
.../com/cloud/upgrade/dao/Upgrade302to303.java | 14 +-
.../java/com/cloud/upgrade/dao/Upgrade302to40.java | 64 +-
.../com/cloud/upgrade/dao/Upgrade303to304.java | 22 +-
.../com/cloud/upgrade/dao/Upgrade304to305.java | 42 +-
.../com/cloud/upgrade/dao/Upgrade305to306.java | 26 +-
.../com/cloud/upgrade/dao/Upgrade306to307.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade307to410.java | 6 +-
.../java/com/cloud/upgrade/dao/Upgrade30to301.java | 4 +-
.../java/com/cloud/upgrade/dao/Upgrade30xBase.java | 14 +-
.../java/com/cloud/upgrade/dao/Upgrade40to41.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade41000to41100.java | 24 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 252 +-
.../com/cloud/upgrade/dao/Upgrade41100to41110.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade41110to41120.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade41120to41130.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41120to41200.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41200to41300.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41300to41310.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41310to41400.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade41400to41500.java | 29 +-
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 116 +-
.../com/cloud/upgrade/dao/Upgrade41510to41520.java | 5 +-
.../com/cloud/upgrade/dao/Upgrade41520to41600.java | 20 +-
.../com/cloud/upgrade/dao/Upgrade41600to41610.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade41700to41710.java | 74 +-
.../com/cloud/upgrade/dao/Upgrade41710to41720.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41720to41800.java | 34 +-
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 20 +-
.../com/cloud/upgrade/dao/Upgrade41810to41900.java | 34 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 7 +-
.../com/cloud/upgrade/dao/Upgrade41910to42000.java | 116 -
.../com/cloud/upgrade/dao/Upgrade42000to42010.java | 122 -
.../com/cloud/upgrade/dao/Upgrade420to421.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade421to430.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade430to440.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade431to440.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade432to440.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade440to441.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade441to442.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade442to450.java | 14 +-
.../com/cloud/upgrade/dao/Upgrade443to444.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade443to450.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade444to450.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade450to451.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade451to452.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade452to453.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade452to460.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade453to460.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade460to461.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade461to470.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade470to471.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade471to480.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade480to481.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade481to490.java | 20 +-
.../com/cloud/upgrade/dao/Upgrade490to4910.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade4910to4920.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade4920to4930.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade4930to41000.java | 4 +-
.../cloud/upgrade/dao/UpgradeSnapshot217to224.java | 2 +-
.../cloud/upgrade/dao/UpgradeSnapshot223to224.java | 2 +-
.../java/com/cloud/upgrade/dao/VersionDaoImpl.java | 14 +-
.../src/main/java/com/cloud/usage/UsageVO.java | 11 +-
.../cloud/usage/dao/BucketStatisticsDaoImpl.java | 2 +
.../com/cloud/usage/dao/UsageBackupDaoImpl.java | 10 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 40 +-
.../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 6 +-
.../java/com/cloud/usage/dao/UsageJobDaoImpl.java | 6 +-
.../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 8 +-
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageNetworksDaoImpl.java | 16 +-
.../usage/dao/UsagePortForwardingRuleDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageStorageDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 8 +-
.../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 8 +-
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 18 +-
.../java/com/cloud/user/AccountDetailsDaoImpl.java | 13 +-
.../src/main/java/com/cloud/user/AccountVO.java | 13 -
.../main/java/com/cloud/user/UserAccountVO.java | 12 +-
.../src/main/java/com/cloud/user/UserVO.java | 14 +-
.../java/com/cloud/user/dao/AccountDaoImpl.java | 38 +-
.../com/cloud/user/dao/UserStatisticsDaoImpl.java | 6 +-
.../cloud/user/dao/VmDiskStatisticsDaoImpl.java | 6 +-
.../com/cloud/util/StoragePoolTypeConverter.java | 40 -
.../main/java/com/cloud/vm/InstanceGroupVO.java | 7 -
.../src/main/java/com/cloud/vm/ItWorkDao.java | 1 -
.../src/main/java/com/cloud/vm/ItWorkDaoImpl.java | 14 +-
.../schema/src/main/java/com/cloud/vm/NicVO.java | 5 +-
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 25 +-
.../java/com/cloud/vm/dao/ConsoleProxyDao.java | 2 +-
.../java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 46 +-
.../java/com/cloud/vm/dao/ConsoleSessionDao.java | 3 -
.../com/cloud/vm/dao/ConsoleSessionDaoImpl.java | 15 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 3 -
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 31 +-
.../com/cloud/vm/dao/NicExtraDhcpOptionDao.java | 1 -
.../cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java | 17 +-
.../java/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 3 +-
.../java/com/cloud/vm/dao/NicSecondaryIpDao.java | 1 -
.../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 13 -
.../java/com/cloud/vm/dao/NicSecondaryIpVO.java | 9 -
.../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 6 +-
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 2 +
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 6 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 60 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 24 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 282 +-
.../main/java/com/cloud/vm/dao/VmStatsDaoImpl.java | 14 +-
.../java/com/cloud/vm/snapshot/VMSnapshotVO.java | 8 -
.../com/cloud/vm/snapshot/dao/VMSnapshotDao.java | 2 -
.../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 35 +-
.../java/org/apache/cloudstack/acl/RoleVO.java | 16 +-
.../acl/dao/ProjectRolePermissionsDaoImpl.java | 2 +
.../org/apache/cloudstack/acl/dao/RoleDao.java | 6 +-
.../org/apache/cloudstack/acl/dao/RoleDaoImpl.java | 22 +-
.../cloudstack/acl/dao/RolePermissionsDaoImpl.java | 4 +-
.../cloudstack/affinity/AffinityGroupVO.java | 6 +-
.../dao/AffinityGroupDomainMapDaoImpl.java | 3 +
.../cloudstack/backup/BackupRepositoryVO.java | 155 --
.../apache/cloudstack/backup/BackupScheduleVO.java | 7 -
.../org/apache/cloudstack/backup/BackupVO.java | 26 -
.../apache/cloudstack/backup/dao/BackupDao.java | 3 +-
.../cloudstack/backup/dao/BackupDaoImpl.java | 30 +-
.../cloudstack/backup/dao/BackupRepositoryDao.java | 31 -
.../backup/dao/BackupRepositoryDaoImpl.java | 67 -
.../cloudstack/backup/dao/BackupScheduleDao.java | 5 -
.../backup/dao/BackupScheduleDaoImpl.java | 17 -
.../cluster/ClusterDrsPlanMigrationVO.java | 8 -
.../cloudstack/cluster/ClusterDrsPlanVO.java | 8 -
.../datacenter/DataCenterIpv4GuestSubnetVO.java | 123 -
.../dao/DataCenterIpv4GuestSubnetDao.java | 33 -
.../dao/DataCenterIpv4GuestSubnetDaoImpl.java | 83 -
.../download/DirectDownloadCertificateVO.java | 11 -
.../engine/cloud/entity/api/db/VMEntityVO.java | 7 +-
.../cloud/entity/api/db/dao/VMEntityDaoImpl.java | 2 +
.../apache/cloudstack/ha/dao/HAConfigDaoImpl.java | 12 +-
.../lb/ApplicationLoadBalancerRuleVO.java | 8 -
.../cloudstack/network/BgpPeerDetailsVO.java | 103 -
.../cloudstack/network/BgpPeerNetworkMapVO.java | 104 -
.../org/apache/cloudstack/network/BgpPeerVO.java | 173 --
.../network/Ipv4GuestSubnetNetworkMapVO.java | 143 -
.../apache/cloudstack/network/dao/BgpPeerDao.java | 40 -
.../cloudstack/network/dao/BgpPeerDaoImpl.java | 193 --
.../cloudstack/network/dao/BgpPeerDetailsDao.java | 33 -
.../network/dao/BgpPeerDetailsDaoImpl.java | 123 -
.../network/dao/BgpPeerNetworkMapDao.java | 48 -
.../network/dao/BgpPeerNetworkMapDaoImpl.java | 185 --
.../network/dao/Ipv4GuestSubnetNetworkMapDao.java | 38 -
.../dao/Ipv4GuestSubnetNetworkMapDaoImpl.java | 170 --
.../network/dao/NetworkPermissionDaoImpl.java | 4 +-
.../dao/OutOfBandManagementDaoImpl.java | 16 +-
.../cloudstack/region/dao/RegionDaoImpl.java | 2 +
.../region/gslb/GlobalLoadBalancerRuleVO.java | 10 -
.../cloudstack/reservation/ReservationVO.java | 68 +-
.../cloudstack/reservation/dao/ReservationDao.java | 17 +-
.../reservation/dao/ReservationDaoImpl.java | 150 +-
.../resourcedetail/FirewallRuleDetailVO.java | 4 -
.../resourcedetail/ResourceDetailsDao.java | 20 +-
.../resourcedetail/ResourceDetailsDaoBase.java | 49 +-
.../cloudstack/resourcedetail/UserDetailVO.java | 2 -
.../apache/cloudstack/secstorage/HeuristicVO.java | 4 +-
.../datastore/db/ImageStoreDetailsDaoImpl.java | 21 +-
.../storage/datastore/db/ImageStoreVO.java | 8 -
.../storage/datastore/db/ObjectStoreVO.java | 8 -
.../storage/datastore/db/PrimaryDataStoreDao.java | 2 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 8 +-
.../storage/datastore/db/SnapshotDataStoreDao.java | 2 -
.../datastore/db/SnapshotDataStoreDaoImpl.java | 32 +-
.../storage/datastore/db/SnapshotDataStoreVO.java | 30 +-
.../storage/datastore/db/StoragePoolVO.java | 27 +-
.../storage/datastore/db/TemplateDataStoreVO.java | 7 +-
.../storage/datastore/db/VolumeDataStoreDao.java | 2 -
.../storage/datastore/db/VolumeDataStoreVO.java | 7 +-
.../cloudstack/storage/sharedfs/SharedFSVO.java | 246 --
.../storage/sharedfs/dao/SharedFSDao.java | 32 -
.../storage/sharedfs/dao/SharedFSDaoImpl.java | 117 -
.../apache/cloudstack/util/CPUArchConverter.java | 36 -
.../cloudstack/util/HypervisorTypeConverter.java | 38 -
.../cloudstack/vm/schedule/VMScheduleVO.java | 6 -
.../cloudstack/vm/schedule/VMScheduledJobVO.java | 10 -
...n-daos-between-management-and-usage-context.xml | 1 -
.../spring-engine-schema-core-daos-context.xml | 14 +-
.../main/resources/META-INF/db/data-217to218.sql | 4 +-
.../cloud.idempotent_add_foreign_key.sql | 28 -
.../main/resources/META-INF/db/schema-20to21.sql | 12 +-
.../main/resources/META-INF/db/schema-217to218.sql | 4 +-
.../META-INF/db/schema-21to22-cleanup.sql | 4 +-
.../META-INF/db/schema-21to22-premium.sql | 6 +-
.../main/resources/META-INF/db/schema-21to22.sql | 28 +-
.../resources/META-INF/db/schema-2210to2211.sql | 4 +-
.../META-INF/db/schema-2211to2212-premium.sql | 4 +-
.../resources/META-INF/db/schema-2211to2212.sql | 4 +-
.../resources/META-INF/db/schema-2212to2213.sql | 4 +-
.../resources/META-INF/db/schema-2213to2214.sql | 6 +-
.../META-INF/db/schema-2214to30-cleanup.sql | 6 +-
.../main/resources/META-INF/db/schema-2214to30.sql | 76 +-
.../META-INF/db/schema-221to222-cleanup.sql | 4 +-
.../META-INF/db/schema-221to222-premium.sql | 4 +-
.../main/resources/META-INF/db/schema-221to222.sql | 6 +-
.../META-INF/db/schema-222to224-cleanup.sql | 4 +-
.../META-INF/db/schema-222to224-premium.sql | 4 +-
.../main/resources/META-INF/db/schema-222to224.sql | 10 +-
.../META-INF/db/schema-224to225-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-224to225.sql | 4 +-
.../main/resources/META-INF/db/schema-225to226.sql | 4 +-
.../META-INF/db/schema-227to228-premium.sql | 4 +-
.../main/resources/META-INF/db/schema-227to228.sql | 8 +-
.../main/resources/META-INF/db/schema-228to229.sql | 4 +-
.../resources/META-INF/db/schema-229to2210.sql | 4 +-
.../META-INF/db/schema-22beta1to22beta2.sql | 4 +-
.../META-INF/db/schema-22beta3to22beta4.sql | 12 +-
.../META-INF/db/schema-301to302-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-301to302.sql | 6 +-
.../main/resources/META-INF/db/schema-302to303.sql | 6 +-
.../META-INF/db/schema-302to40-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-302to40.sql | 18 +-
.../META-INF/db/schema-304to305-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-304to305.sql | 8 +-
.../META-INF/db/schema-305to306-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-305to306.sql | 4 +-
.../main/resources/META-INF/db/schema-306to307.sql | 4 +-
.../main/resources/META-INF/db/schema-307to410.sql | 12 +-
.../main/resources/META-INF/db/schema-30to301.sql | 4 +-
.../main/resources/META-INF/db/schema-40to410.sql | 56 +-
.../main/resources/META-INF/db/schema-410to420.sql | 88 +-
.../resources/META-INF/db/schema-41310to41400.sql | 2 +-
.../META-INF/db/schema-41910to42000-cleanup.sql | 20 -
.../resources/META-INF/db/schema-41910to42000.sql | 427 ---
.../META-INF/db/schema-42000to42010-cleanup.sql | 23 -
.../resources/META-INF/db/schema-42000to42010.sql | 71 -
.../main/resources/META-INF/db/schema-420to421.sql | 4 +-
.../main/resources/META-INF/db/schema-442to450.sql | 4 +-
.../META-INF/db/schema-481to490-cleanup.sql | 2 +-
.../main/resources/META-INF/db/schema-481to490.sql | 16 +-
.../resources/META-INF/db/schema-4930to41000.sql | 4 +-
.../main/resources/META-INF/db/schema-level.sql | 4 +-
.../META-INF/db/schema-snapshot-217to224.sql | 4 +-
.../META-INF/db/schema-snapshot-223to224.sql | 4 +-
.../META-INF/db/views/cloud.account_view.sql | 187 +-
.../META-INF/db/views/cloud.domain_view.sql | 20 +-
.../META-INF/db/views/cloud.host_view.sql | 9 +-
.../META-INF/db/views/cloud.mshost_peer_view.sql | 44 -
.../db/views/cloud.network_offering_view.sql | 12 +-
.../db/views/cloud.shared_filesystem_view.sql | 83 -
.../META-INF/db/views/cloud.storage_pool_view.sql | 2 -
.../META-INF/db/views/cloud.template_view.sql | 1 -
.../META-INF/db/views/cloud.user_view.sql | 1 -
.../META-INF/db/views/cloud.user_vm_view.sql | 2 -
.../META-INF/db/views/cloud.volume_view.sql | 1 -
.../META-INF/db/views/cloud.vpc_offering_view.sql | 5 +-
.../db/views/cloud.webhook_delivery_view.sql | 48 -
.../META-INF/db/views/cloud.webhook_view.sql | 52 -
.../cloud/capacity/dao/CapacityDaoImplTest.java | 99 -
.../java/com/cloud/dc/dao/ClusterDaoImplTest.java | 78 -
.../src/test/java/com/cloud/host/HostVOTest.java | 233 +-
.../java/com/cloud/host/dao/HostDaoImplTest.java | 184 --
.../as/dao/AutoScaleVmGroupVmMapDaoImplTest.java | 45 +-
.../cloud/network/dao/IPAddressDaoImplTest.java | 67 -
.../dao/InlineLoadBalancerNicMapDaoImplTest.java | 67 -
.../network/dao/LoadBalancerVMMapDaoImplTest.java | 67 -
.../dao/OpRouterMonitorServiceDaoImplTest.java | 67 -
.../rules/dao/PortForwardingRulesDaoImplTest.java | 68 -
.../offerings/dao/NetworkOfferingDaoImplTest.java | 10 +-
.../secstorage/CommandExecLogDaoImplTest.java | 67 -
.../storage/dao/StoragePoolTagsDaoImplTest.java | 20 +-
.../com/cloud/storage/dao/VolumeDaoImplTest.java | 40 -
.../upgrade/dao/DatabaseAccessObjectTest.java | 7 +-
.../cloud/upgrade/dao/Upgrade41700to41710Test.java | 123 -
.../cloud/usage/dao/UsageStorageDaoImplTest.java | 9 +-
.../test/java/com/cloud/vm/ItWorkDaoImplTest.java | 67 -
.../cloud/vm/dao/ConsoleSessionDaoImplTest.java | 68 -
.../test/java/com/cloud/vm/dao/NicDaoImplTest.java | 69 -
.../vm/dao/NicExtraDhcpOptionDaoImplTest.java | 68 -
.../cloud/vm/dao/NicSecondaryIpDaoImplTest.java | 67 -
.../com/cloud/vm/dao/VMInstanceDaoImplTest.java | 61 +-
.../vm/snapshot/dao/VMSnapshotDaoImplTest.java | 69 -
.../resourcedetail/ResourceDetailsDaoBaseTest.java | 181 --
.../datastore/db/PrimaryDataStoreDaoImplTest.java | 39 +-
.../datastore/db/SnapshotDataStoreDaoImplTest.java | 67 -
.../org.mockito.plugins.MockMaker | 1 +
engine/schema/templateConfig.sh | 19 +-
engine/service/pom.xml | 7 +-
engine/service/src/main/webapp/WEB-INF/log4j.xml | 59 +-
engine/storage/cache/pom.xml | 2 +-
.../allocator/StorageCacheRandomAllocator.java | 15 +-
.../cache/manager/StorageCacheManagerImpl.java | 27 +-
.../spring-engine-storage-cache-core-context.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
.../storage/configdrive/ConfigDriveBuilder.java | 199 +-
.../storage/configdrive/ConfigDriveUtils.java | 54 -
.../configdrive/ConfigDriveBuilderTest.java | 198 +-
.../storage/configdrive/ConfigDriveUtilsTest.java | 108 -
.../org.mockito.plugins.MockMaker | 1 +
engine/storage/datamotion/pom.xml | 2 +-
.../storage/motion/AncientDataMotionStrategy.java | 73 +-
.../storage/motion/DataMotionServiceImpl.java | 5 +-
.../KvmNonManagedStorageDataMotionStrategy.java | 16 +-
.../motion/StorageSystemDataMotionStrategy.java | 111 +-
.../motion/AncientDataMotionStrategyTest.java | 19 +-
.../KvmNonManagedStorageSystemDataMotionTest.java | 3 +-
.../StorageSystemDataMotionStrategyTest.java | 2 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/SecondaryStorageServiceImpl.java | 110 +-
.../storage/image/TemplateDataFactoryImpl.java | 19 +-
.../storage/image/TemplateServiceImpl.java | 141 +-
.../manager/ImageStoreProviderManagerImpl.java | 11 +-
.../storage/image/store/ImageStoreImpl.java | 14 +-
.../storage/image/store/TemplateObject.java | 30 +-
.../image/SecondaryStorageServiceImplTest.java | 138 -
engine/storage/integration-test/pom.xml | 2 +-
.../storage/test/DirectAgentManagerSimpleImpl.java | 2 +
.../cloudstack/storage/test/MockRpcCallBack.java | 7 +-
.../src/test/resources/component.xml | 28 +-
.../src/test/resources/s3_testng.xml | 6 +-
.../src/test/resources/storageContext.xml | 32 +-
.../integration-test/src/test/resources/testng.xml | 8 +-
engine/storage/object/pom.xml | 2 +-
.../storage/object/ObjectStorageServiceImpl.java | 3 +
.../manager/ObjectStoreProviderManagerImpl.java | 2 +
.../storage/object/store/ObjectStoreImpl.java | 39 +-
.../object/src/test/resource/testContext.xml | 12 +-
.../org.mockito.plugins.MockMaker | 1 +
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 7 +-
.../storage/snapshot/CephSnapshotStrategy.java | 4 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 48 +-
.../storage/snapshot/ScaleIOSnapshotStrategy.java | 4 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 2 +-
.../storage/snapshot/SnapshotObject.java | 25 +-
.../storage/snapshot/SnapshotServiceImpl.java | 123 +-
.../storage/snapshot/SnapshotStrategyBase.java | 3 -
.../snapshot/StorageSystemSnapshotStrategy.java | 38 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 32 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 51 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 34 +-
...spring-engine-storage-snapshot-core-context.xml | 2 +-
...ing-engine-storage-snapshot-storage-context.xml | 2 +-
.../storage/snapshot/CephSnapshotStrategyTest.java | 2 +-
.../vmsnapshot/VMSnapshotStrategyKVMTest.java | 38 +-
.../storage/vmsnapshot/VMSnapshotStrategyTest.java | 66 +-
.../test/resources/SnapshotManagerTestContext.xml | 20 +-
.../org.mockito.plugins.MockMaker | 1 +
.../cloudstack/storage/LocalHostEndpoint.java | 5 -
.../cloudstack/storage/RemoteHostEndPoint.java | 20 +-
.../allocator/AbstractStoragePoolAllocator.java | 100 +-
.../ClusterScopeStoragePoolAllocator.java | 20 +-
.../GarbageCollectingStoragePoolAllocator.java | 4 +-
.../allocator/LocalStoragePoolAllocator.java | 16 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 18 +-
.../storage/datastore/DataObjectManagerImpl.java | 55 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 27 +-
.../provider/DataStoreProviderManagerImpl.java | 10 +-
.../storage/db/ObjectInDataStoreDaoImpl.java | 6 +-
.../storage/endpoint/DefaultEndPointSelector.java | 15 +-
.../storage/helper/HypervisorHelperImpl.java | 11 +-
.../storage/helper/VMSnapshotHelperImpl.java | 15 +-
.../storage/image/BaseImageStoreDriverImpl.java | 96 +-
.../storage/image/db/TemplateDataStoreDaoImpl.java | 18 +-
.../storage/image/db/VolumeDataStoreDaoImpl.java | 26 +-
.../image/deployasis/DeployAsIsHelperImpl.java | 45 +-
.../storage/object/BaseObjectStoreDriverImpl.java | 5 +-
.../storage/object/ObjectStoreDriver.java | 23 +-
.../storage/vmsnapshot/VMSnapshotHelper.java | 4 +-
.../volume/datastore/PrimaryDataStoreHelper.java | 19 +-
.../core/spring-engine-storage-core-context.xml | 6 +-
...ng-engine-storage-storage-allocator-context.xml | 4 +-
.../api/storage/StrategyPriorityTest.java | 2 +-
.../image/db/VolumeDataStoreDaoImplTest.java | 68 -
engine/storage/volume/pom.xml | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 26 +-
.../BasePrimaryDataStoreLifeCycleImpl.java | 32 +-
.../datastore/provider/DefaultHostListener.java | 49 +-
.../cloudstack/storage/volume/VolumeObject.java | 33 +-
.../storage/volume/VolumeServiceImpl.java | 428 +--
.../spring-engine-storage-volume-core-context.xml | 2 +-
.../BasePrimaryDataStoreLifeCycleImplTest.java | 2 +-
.../storage/volume/VolumeServiceTest.java | 17 +-
.../volume/src/test/resource/testContext.xml | 12 +-
engine/userdata/cloud-init/pom.xml | 2 +-
.../userdata/CloudInitUserDataProvider.java | 13 +-
engine/userdata/pom.xml | 2 +-
.../cloudstack/userdata/UserDataManagerImpl.java | 14 +-
.../core/spring-engine-userdata-core-context.xml | 2 +-
framework/agent-lb/pom.xml | 2 +-
.../agent/lb/IndirectAgentLBAlgorithm.java | 4 -
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
.../com/cloud/cluster/ClusterFenceManagerImpl.java | 4 +-
.../java/com/cloud/cluster/ClusterManager.java | 4 +-
.../java/com/cloud/cluster/ClusterManagerImpl.java | 309 +--
.../cluster/ClusterServiceServletAdapter.java | 10 +-
.../cluster/ClusterServiceServletContainer.java | 41 +-
.../cluster/ClusterServiceServletHttpHandler.java | 41 +-
.../cloud/cluster/ClusterServiceServletImpl.java | 31 +-
.../cluster/ManagementServerHostPeerJoinVO.java | 177 --
.../com/cloud/cluster/ManagementServerHostVO.java | 5 +-
.../cluster/dao/ManagementServerHostDaoImpl.java | 16 +-
.../cluster/dao/ManagementServerHostPeerDao.java | 9 +-
.../dao/ManagementServerHostPeerDaoImpl.java | 49 +-
.../dao/ManagementServerHostPeerJoinDao.java | 27 -
.../dao/ManagementServerHostPeerJoinDaoImpl.java | 42 -
.../core/spring-framework-cluster-core-context.xml | 6 +-
.../cluster/ClusterServiceServletAdapterTest.java | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigDepot.java | 2 -
.../cloudstack/framework/config/ConfigKey.java | 38 +-
.../config/ConfigKeyScheduledExecutionWrapper.java | 114 -
.../framework/config/ScopedConfigStorage.java | 6 +-
.../framework/config/dao/ConfigurationDaoImpl.java | 8 +-
.../framework/config/impl/ConfigDepotImpl.java | 49 +-
...framework-config-system-context-inheritable.xml | 4 +-
.../ConfigKeyScheduledExecutionWrapperTest.java | 177 --
.../config/impl/ConfigDepotAdminTest.java | 13 +-
.../framework/config/impl/ConfigDepotImplTest.java | 56 -
framework/db/pom.xml | 10 +-
.../com/cloud/utils/db/ConnectionConcierge.java | 33 +-
.../src/main/java/com/cloud/utils/db/DbUtil.java | 5 +-
.../main/java/com/cloud/utils/db/DriverLoader.java | 5 +-
.../main/java/com/cloud/utils/db/GenericDao.java | 25 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 278 +-
.../main/java/com/cloud/utils/db/GlobalLock.java | 37 +-
.../main/java/com/cloud/utils/db/Merovingian2.java | 77 +-
.../main/java/com/cloud/utils/db/ScriptRunner.java | 11 +-
.../java/com/cloud/utils/db/SequenceFetcher.java | 13 +-
.../main/java/com/cloud/utils/db/Transaction.java | 2 +
.../java/com/cloud/utils/db/TransactionLegacy.java | 372 +--
.../system/spring-framework-db-system-context.xml | 2 +-
.../src/test/java/com/cloud/utils/DbUtilTest.java | 14 +-
.../java/com/cloud/utils/db/DbAnnotatedBase.java | 7 +-
.../com/cloud/utils/db/ElementCollectionTest.java | 2 +
.../java/com/cloud/utils/db/GlobalLockTest.java | 9 +-
.../java/com/cloud/utils/db/Merovingian2Test.java | 15 +-
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
.../apache/cloudstack/framework/events/Event.java | 71 +-
.../cloudstack/framework/events/EventBus.java | 2 -
.../framework/events/EventDistributor.java | 35 -
.../framework/events/EventDistributorImpl.java | 68 -
.../framework/events/EventDistributorImplTest.java | 67 -
framework/ipc/pom.xml | 2 +-
.../framework/async/AsyncCallbackDispatcher.java | 7 +-
.../framework/client/ClientTransportProvider.java | 7 +-
.../framework/messagebus/MessageBusBase.java | 33 +-
.../framework/messagebus/MessageDetector.java | 9 +-
.../framework/messagebus/MessageDispatcher.java | 33 +-
.../framework/serializer/OnwireClassRegistry.java | 23 +-
.../framework/server/ServerTransportProvider.java | 7 +-
.../core/spring-framework-ipc-core-context.xml | 6 +-
.../sampleserver/SampleManagementServer.java | 7 +-
.../sampleserver/SampleManagementServerApp.java | 4 +-
.../sampleserver/SampleManagerComponent.java | 9 +-
.../sampleserver/SampleManagerComponent2.java | 9 +-
.../cloudstack/messagebus/TestMessageBus.java | 4 +
.../src/test/resources/MessageBusTestContext.xml | 10 +-
.../resources/SampleManagementServerAppContext.xml | 12 +-
framework/ipc/src/test/resources/log4j-cloud.xml | 129 +-
framework/jobs/pom.xml | 2 +-
.../framework/jobs/AsyncJobExecutionContext.java | 17 +-
.../framework/jobs/dao/AsyncJobDaoImpl.java | 8 +-
.../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java | 4 +-
.../framework/jobs/dao/SyncQueueDaoImpl.java | 6 +-
.../framework/jobs/dao/SyncQueueItemDaoImpl.java | 6 +-
.../framework/jobs/dao/VmWorkJobDao.java | 2 -
.../framework/jobs/dao/VmWorkJobDaoImpl.java | 44 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 186 +-
.../framework/jobs/impl/AsyncJobMonitor.java | 10 +-
.../cloudstack/framework/jobs/impl/AsyncJobVO.java | 27 +-
.../framework/jobs/impl/JobSerializerHelper.java | 7 +-
.../framework/jobs/impl/SyncQueueManagerImpl.java | 32 +-
.../framework/jobs/AsyncJobTestDispatcher.java | 7 +-
.../framework/jobs/dao/VmWorkJobDaoImplTest.java | 140 -
.../test/resources/AsyncJobManagerTestContext.xml | 4 +-
.../jobs/src/test/resources/commonContext.xml | 20 +-
framework/managed-context/pom.xml | 11 +-
.../managed/context/ManagedContextRunnable.java | 7 +-
.../context/impl/DefaultManagedContext.java | 9 +-
.../managed/threadlocal/ManagedThreadLocal.java | 7 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../apache/cloudstack/quota/QuotaAlertManager.java | 3 -
.../cloudstack/quota/QuotaAlertManagerImpl.java | 163 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 128 +-
.../cloudstack/quota/QuotaStatementImpl.java | 57 +-
.../activationrule/presetvariables/Account.java | 4 +-
.../presetvariables/BackupOffering.java | 1 -
.../presetvariables/ComputeOffering.java | 1 -
.../presetvariables/ComputingResources.java | 5 -
.../activationrule/presetvariables/Domain.java | 1 -
.../presetvariables/GenericPresetVariable.java | 10 +-
.../quota/activationrule/presetvariables/Host.java | 2 -
.../presetvariables/PresetVariableDefinition.java | 42 -
.../presetvariables/PresetVariableHelper.java | 5 +-
.../presetvariables/PresetVariables.java | 11 -
.../activationrule/presetvariables/Resource.java | 6 +-
.../quota/activationrule/presetvariables/Role.java | 1 -
.../activationrule/presetvariables/Storage.java | 4 -
.../activationrule/presetvariables/Tariff.java | 33 -
.../activationrule/presetvariables/Value.java | 50 -
.../cloudstack/quota/constant/QuotaConfig.java | 9 +-
.../cloudstack/quota/constant/QuotaTypes.java | 10 -
.../cloudstack/quota/dao/QuotaAccountDaoImpl.java | 4 +-
.../cloudstack/quota/dao/QuotaBalanceDaoImpl.java | 12 +-
.../quota/dao/QuotaEmailConfigurationDao.java | 36 -
.../quota/dao/QuotaEmailConfigurationDaoImpl.java | 105 -
.../quota/dao/QuotaEmailTemplatesDao.java | 2 -
.../quota/dao/QuotaEmailTemplatesDaoImpl.java | 7 +-
.../cloudstack/quota/dao/QuotaTariffDao.java | 12 +-
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 156 +-
.../cloudstack/quota/dao/QuotaUsageDaoImpl.java | 2 +
.../quota/vo/QuotaEmailConfigurationVO.java | 68 -
.../apache/cloudstack/quota/vo/QuotaTariffVO.java | 27 +-
.../quota/spring-framework-quota-context.xml | 1 -
.../quota/QuotaAlertManagerImplTest.java | 167 +-
.../cloudstack/quota/QuotaManagerImplTest.java | 53 +-
.../cloudstack/quota/QuotaStatementTest.java | 69 +-
.../activationrule/presetvariables/ValueTest.java | 14 -
.../cloudstack/quota/constant/QuotaTypesTest.java | 2 +-
framework/rest/pom.xml | 4 +-
framework/security/pom.xml | 2 +-
.../framework/security/keys/KeysManagerImpl.java | 9 +-
.../security/keystore/KeystoreManagerImpl.java | 14 +-
framework/spring/lifecycle/pom.xml | 2 +-
.../spring/lifecycle/AbstractSmartLifeCycle.java | 3 -
.../lifecycle/CloudStackExtendedLifeCycle.java | 60 +-
.../CloudStackExtendedLifeCycleStart.java | 1 +
.../spring/lifecycle/registry/DumpRegistry.java | 4 +-
.../lifecycle/registry/ExtensionRegistry.java | 7 +-
.../lifecycle/registry/RegistryLifecycle.java | 17 +-
framework/spring/module/pom.xml | 2 +-
.../module/factory/CloudStackSpringContext.java | 11 +-
.../model/impl/DefaultModuleDefinitionSet.java | 53 +-
.../web/CloudStackContextLoaderListener.java | 11 +-
.../base/test-context-inheritable.xml | 2 +-
.../resources/testhierarchy/base/test-context.xml | 4 +-
.../testhierarchy/child1-1/test-context.xml | 4 +-
.../testhierarchy/child1/test-context-override.xml | 4 +-
.../testhierarchy/child1/test-context.xml | 6 +-
.../testhierarchy/child2/test-context.xml | 2 +-
.../testhierarchy/excluded/test-context.xml | 2 +-
.../testhierarchy/excluded2/test-context.xml | 2 +-
.../orphan-of-excluded/test-context.xml | 2 +-
.../testhierarchy/orphan1/test-context.xml | 2 +-
packaging/README.md | 8 +-
packaging/{el8 => centos7}/cloud-ipallocator.rc | 0
packaging/{el8 => centos7}/cloud.limits | 0
packaging/{el8 => centos7}/cloud.spec | 157 +-
packaging/{el8 => centos7}/cloudstack-agent.te | 0
packaging/{el8 => centos7}/cloudstack-sccs | 0
packaging/{el8 => centos7}/filelimit.conf | 0
packaging/{el8 => centos7}/replace.properties | 6 +-
packaging/centos8 | 1 -
packaging/{el8 => centos8}/cloud-ipallocator.rc | 0
packaging/{el8 => centos8}/cloud.limits | 0
packaging/{el8 => centos8}/cloud.spec | 42 +-
packaging/{el8 => centos8}/cloudstack-agent.te | 0
packaging/{el8 => centos8}/cloudstack-sccs | 0
packaging/{el8 => centos8}/filelimit.conf | 0
packaging/{el8 => centos8}/replace.properties | 4 +-
packaging/debian/replace.properties | 4 +-
packaging/el9 | 2 +-
packaging/package.sh | 16 +-
packaging/suse15 | 2 +-
packaging/systemd/cloudstack-agent.service | 2 -
packaging/systemd/cloudstack-management.default | 4 +-
packaging/systemd/cloudstack-management.service | 2 -
packaging/systemd/cloudstack-usage.default | 2 +-
packaging/systemd/cloudstack-usage.service | 2 -
plugins/acl/dynamic-role-based/pom.xml | 2 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 82 +-
plugins/acl/project-role-based/pom.xml | 2 +-
.../acl/ProjectRoleBasedApiAccessChecker.java | 26 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/acl/static-role-based/pom.xml | 2 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 6 +-
.../spring-acl-static-role-based-context.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../affinity/ExplicitDedicationProcessor.java | 48 +-
.../spring-explicit-dedication-context.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../cloudstack/affinity/HostAffinityProcessor.java | 12 +-
.../affinity/HostAffinityProcessorTest.java | 14 +-
.../host-anti-affinity/pom.xml | 2 +-
.../affinity/HostAntiAffinityProcessor.java | 54 +-
.../spring-host-anti-affinity-context.xml | 2 +-
.../non-strict-host-affinity/pom.xml | 2 +-
.../affinity/NonStrictHostAffinityProcessor.java | 12 +-
.../spring-non-strict-host-affinity-context.xml | 2 +-
.../non-strict-host-anti-affinity/pom.xml | 2 +-
...pring-non-strict-host-anti-affinity-context.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 10 +-
.../alert/snmp/SnmpEnhancedPatternLayout.java | 37 +-
.../cloudstack/alert/snmp/SnmpTrapAppender.java | 138 +-
.../alert/snmp/SnmpEnhancedPatternLayoutTest.java | 54 +-
.../alert/snmp/SnmpTrapAppenderTest.java | 11 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 10 +-
.../cloudstack/syslog/AlertsSyslogAppender.java | 168 +-
.../syslog/AlertsSyslogAppenderTest.java | 21 +-
plugins/api/discovery/pom.xml | 2 +-
.../api/command/user/discovery/ListApisCmd.java | 2 +
.../discovery/ApiDiscoveryServiceImpl.java | 14 +-
plugins/api/rate-limit/pom.xml | 4 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 2 +
.../api/command/user/ratelimit/GetApiLimitCmd.java | 2 +
.../ratelimit/ApiRateLimitServiceImpl.java | 12 +-
.../rate-limit/spring-rate-limit-context.xml | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
.../admin/solidfire/GetPathForVolumeCmd.java | 4 +-
.../admin/solidfire/GetSolidFireAccountIdCmd.java | 4 +-
.../GetSolidFireVolumeAccessGroupIdsCmd.java | 4 +-
.../admin/solidfire/GetSolidFireVolumeSizeCmd.java | 4 +-
.../solidfire/GetVolumeSnapshotDetailsCmd.java | 4 +-
.../admin/solidfire/GetVolumeiScsiNameCmd.java | 4 +-
.../ApiSolidFireIntegrationTestServiceImpl.java | 1 +
plugins/api/vmware-sioc/pom.xml | 2 +-
.../api/command/admin/sioc/UpdateSiocInfoCmd.java | 4 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 22 +-
.../apache/cloudstack/util/vmware/VMwareUtil.java | 7 +-
plugins/backup/dummy/pom.xml | 2 +-
.../cloudstack/backup/DummyBackupProvider.java | 22 +-
plugins/backup/nas/pom.xml | 54 -
.../cloudstack/backup/NASBackupProvider.java | 447 ----
.../cloudstack/backup/NasBackupOffering.java | 75 -
.../META-INF/cloudstack/nas/module.properties | 18 -
.../cloudstack/nas/spring-backup-nas-context.xml | 26 -
plugins/backup/networker/pom.xml | 2 +-
.../cloudstack/backup/NetworkerBackupProvider.java | 43 +-
.../backup/networker/NetworkerClient.java | 11 +-
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/VeeamBackupProvider.java | 51 +-
.../cloudstack/backup/veeam/VeeamClient.java | 121 +-
.../cloudstack/backup/VeeamBackupProviderTest.java | 2 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 28 +-
plugins/ca/root-ca/pom.xml | 2 +-
.../ca/provider/RootCACustomTrustManager.java | 23 +-
.../cloudstack/ca/provider/RootCAProvider.java | 44 +-
.../ca/provider/RootCACustomTrustManagerTest.java | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
.../java/com/cloud/utils/db/StaticStrategy.java | 7 +-
plugins/database/quota/pom.xml | 7 +-
.../cloudstack/api/command/QuotaBalanceCmd.java | 9 +-
.../api/command/QuotaConfigureEmailCmd.java | 79 -
.../cloudstack/api/command/QuotaCreditsCmd.java | 2 +
.../api/command/QuotaEmailTemplateListCmd.java | 2 +
.../api/command/QuotaEmailTemplateUpdateCmd.java | 2 +
.../cloudstack/api/command/QuotaEnabledCmd.java | 2 +
.../command/QuotaListEmailConfigurationCmd.java | 54 -
.../api/command/QuotaPresetVariablesListCmd.java | 66 -
.../cloudstack/api/command/QuotaStatementCmd.java | 8 +-
.../cloudstack/api/command/QuotaSummaryCmd.java | 2 +
.../api/command/QuotaTariffCreateCmd.java | 29 +-
.../api/command/QuotaTariffDeleteCmd.java | 2 +
.../cloudstack/api/command/QuotaTariffListCmd.java | 45 +-
.../api/command/QuotaTariffUpdateCmd.java | 26 +-
.../cloudstack/api/command/QuotaUpdateCmd.java | 2 +
.../api/response/QuotaConfigureEmailResponse.java | 78 -
.../response/QuotaPresetVariablesItemResponse.java | 47 -
.../api/response/QuotaResponseBuilder.java | 21 +-
.../api/response/QuotaResponseBuilderImpl.java | 359 +--
.../api/response/QuotaTariffResponse.java | 61 +-
.../org/apache/cloudstack/quota/QuotaService.java | 2 +
.../apache/cloudstack/quota/QuotaServiceImpl.java | 110 +-
.../api/command/QuotaBalanceCmdTest.java | 2 +-
.../api/command/QuotaEmailTemplateListCmdTest.java | 2 +-
.../command/QuotaEmailTemplateUpdateCmdTest.java | 2 +-
.../api/command/QuotaStatementCmdTest.java | 2 +-
.../api/command/QuotaTariffListCmdTest.java | 28 +-
.../api/command/QuotaTariffUpdateCmdTest.java | 6 +-
.../api/response/QuotaResponseBuilderImplTest.java | 258 +-
.../cloudstack/quota/QuotaServiceImplTest.java | 13 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/dedicated-resources/pom.xml | 2 +-
.../api/commands/DedicateClusterCmd.java | 2 +
.../cloudstack/api/commands/DedicateHostCmd.java | 2 +
.../cloudstack/api/commands/DedicatePodCmd.java | 2 +
.../cloudstack/api/commands/DedicateZoneCmd.java | 2 +
.../api/commands/ListDedicatedClustersCmd.java | 2 +
.../api/commands/ListDedicatedHostsCmd.java | 2 +
.../api/commands/ListDedicatedPodsCmd.java | 2 +
.../api/commands/ListDedicatedZonesCmd.java | 2 +
.../api/commands/ReleaseDedicatedClusterCmd.java | 2 +
.../api/commands/ReleaseDedicatedHostCmd.java | 2 +
.../api/commands/ReleaseDedicatedPodCmd.java | 2 +
.../api/commands/ReleaseDedicatedZoneCmd.java | 2 +
.../dedicated/DedicatedResourceManagerImpl.java | 138 +-
.../spring-dedicated-resources-core-context.xml | 2 +-
.../dedicated/manager/DedicatedApiUnitTest.java | 12 +-
.../implicit-dedication/pom.xml | 2 +-
.../cloud/deploy/ImplicitDedicationPlanner.java | 67 +-
.../spring-implicit-dedication-context.xml | 18 +-
.../implicitplanner/ImplicitPlannerTest.java | 40 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../cloud/deploy/UserConcentratedPodPlanner.java | 22 +-
.../spring-user-concentrated-pod-context.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
.../com/cloud/deploy/UserDispersingPlanner.java | 38 +-
plugins/drs/cluster/balanced/pom.xml | 2 +-
.../org/apache/cloudstack/cluster/Balanced.java | 27 +-
.../apache/cloudstack/cluster/BalancedTest.java | 18 +-
plugins/drs/cluster/condensed/pom.xml | 2 +-
.../org/apache/cloudstack/cluster/Condensed.java | 27 +-
.../apache/cloudstack/cluster/CondensedTest.java | 19 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
.../cloudstack/mom/inmemory/InMemoryEventBus.java | 7 +-
plugins/event-bus/kafka/pom.xml | 2 +-
.../apache/cloudstack/mom/kafka/KafkaEventBus.java | 10 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 33 +-
plugins/event-bus/webhook/pom.xml | 46 -
.../org/apache/cloudstack/mom/webhook/Webhook.java | 48 -
.../cloudstack/mom/webhook/WebhookApiService.java | 44 -
.../mom/webhook/WebhookApiServiceImpl.java | 574 ----
.../cloudstack/mom/webhook/WebhookDelivery.java | 39 -
.../mom/webhook/WebhookDeliveryThread.java | 287 --
.../cloudstack/mom/webhook/WebhookEventBus.java | 88 -
.../cloudstack/mom/webhook/WebhookService.java | 63 -
.../cloudstack/mom/webhook/WebhookServiceImpl.java | 353 ---
.../webhook/api/command/user/CreateWebhookCmd.java | 167 --
.../webhook/api/command/user/DeleteWebhookCmd.java | 84 -
.../api/command/user/DeleteWebhookDeliveryCmd.java | 126 -
.../command/user/ExecuteWebhookDeliveryCmd.java | 132 -
.../api/command/user/ListWebhookDeliveriesCmd.java | 125 -
.../webhook/api/command/user/ListWebhooksCmd.java | 95 -
.../webhook/api/command/user/UpdateWebhookCmd.java | 136 -
.../api/response/WebhookDeliveryResponse.java | 136 -
.../mom/webhook/api/response/WebhookResponse.java | 158 --
.../cloudstack/mom/webhook/dao/WebhookDao.java | 31 -
.../cloudstack/mom/webhook/dao/WebhookDaoImpl.java | 99 -
.../mom/webhook/dao/WebhookDeliveryDao.java | 29 -
.../mom/webhook/dao/WebhookDeliveryDaoImpl.java | 73 -
.../mom/webhook/dao/WebhookDeliveryJoinDao.java | 33 -
.../webhook/dao/WebhookDeliveryJoinDaoImpl.java | 71 -
.../cloudstack/mom/webhook/dao/WebhookJoinDao.java | 28 -
.../mom/webhook/dao/WebhookJoinDaoImpl.java | 45 -
.../mom/webhook/vo/WebhookDeliveryJoinVO.java | 182 --
.../mom/webhook/vo/WebhookDeliveryVO.java | 174 --
.../cloudstack/mom/webhook/vo/WebhookJoinVO.java | 234 --
.../cloudstack/mom/webhook/vo/WebhookVO.java | 232 --
.../META-INF/cloudstack/webhook/module.properties | 18 -
.../webhook/spring-event-webhook-context.xml | 41 -
.../mom/webhook/WebhookApiServiceImplTest.java | 253 --
.../mom/webhook/WebhookDeliveryThreadTest.java | 62 -
.../mom/webhook/WebhookEventBusTest.java | 106 -
.../api/command/user/CreateWebhookCmdTest.java | 173 --
.../api/command/user/DeleteWebhookCmdTest.java | 106 -
.../command/user/DeleteWebhookDeliveryCmdTest.java | 108 -
.../user/ExecuteWebhookDeliveryCmdTest.java | 153 --
.../command/user/ListWebhookDeliveriesCmdTest.java | 141 -
.../api/command/user/ListWebhooksCmdTest.java | 105 -
.../api/command/user/UpdateWebhookCmdTest.java | 163 --
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
.../com/cloud/deploy/SkipHeuresticsPlanner.java | 6 +-
.../spring-skip-heurestics-context.xml | 18 +-
plugins/host-allocators/random/pom.xml | 2 +-
.../manager/allocator/impl/RandomAllocator.java | 88 +-
.../spring-host-allocator-random-context.xml | 2 +-
.../allocator/impl/RandomAllocatorTest.java | 80 -
plugins/hypervisors/baremetal/pom.xml | 4 +-
.../baremetal/manager/BareMetalDiscoverer.java | 22 +-
.../com/cloud/baremetal/manager/BareMetalGuru.java | 2 +
.../cloud/baremetal/manager/BareMetalPlanner.java | 34 +-
.../manager/BareMetalTemplateAdapter.java | 12 +-
.../baremetal/manager/BaremetalManagerImpl.java | 14 +-
.../networkservice/BareMetalPingServiceImpl.java | 14 +-
.../networkservice/BareMetalResourceBase.java | 52 +-
.../networkservice/BaremetaNetworkGuru.java | 6 +-
.../networkservice/BaremetalDhcpElement.java | 4 +-
.../networkservice/BaremetalDhcpManagerImpl.java | 12 +-
.../networkservice/BaremetalDhcpResourceBase.java | 4 +-
.../networkservice/BaremetalDhcpdResource.java | 8 +-
.../networkservice/BaremetalDnsmasqResource.java | 8 +-
.../BaremetalKickStartPxeResource.java | 16 +-
.../BaremetalKickStartServiceImpl.java | 16 +-
.../networkservice/BaremetalPingPxeResource.java | 22 +-
.../networkservice/BaremetalPxeElement.java | 4 +-
.../networkservice/BaremetalPxeManagerImpl.java | 6 +-
.../networkservice/BaremetalPxeResourceBase.java | 4 +-
.../Force10BaremetalSwitchBackend.java | 5 +-
.../networkservice/SecurityGroupHttpClient.java | 5 +-
.../apache/cloudstack/api/AddBaremetalDhcpCmd.java | 4 +-
.../apache/cloudstack/api/AddBaremetalPxeCmd.java | 4 +-
.../apache/cloudstack/api/AddBaremetalRctCmd.java | 4 +-
.../api/BaremetalProvisionDoneNotificationCmd.java | 4 +-
.../cloudstack/api/DeleteBaremetalRctCmd.java | 4 +-
.../cloudstack/api/ListBaremetalDhcpCmd.java | 4 +-
.../cloudstack/api/ListBaremetalPxeServersCmd.java | 4 +-
.../apache/cloudstack/api/ListBaremetalRctCmd.java | 4 +-
plugins/hypervisors/hyperv/conf/log4j-cloud.xml.in | 99 +-
plugins/hypervisors/hyperv/pom.xml | 5 +-
.../main/java/com/cloud/ha/HypervInvestigator.java | 4 +-
.../hyperv/discoverer/HypervServerDiscoverer.java | 48 +-
.../cloud/hypervisor/hyperv/guru/HypervGuru.java | 2 +-
.../hyperv/manager/HypervManagerImpl.java | 55 +-
.../resource/HypervDirectConnectResource.java | 496 ++--
.../motion/HypervStorageMotionStrategy.java | 15 +-
.../spring-hyperv-compute-context.xml | 18 +-
.../spring-hyperv-discoverer-context.xml | 18 +-
.../test/HypervDirectConnectResourceTest.java | 55 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../main/java/com/cloud/ha/KVMInvestigator.java | 17 +-
.../cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java | 6 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 42 +-
.../hypervisor/kvm/resource/DirectVifDriver.java | 2 +
.../hypervisor/kvm/resource/IvsVifDriver.java | 14 +-
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 9 +-
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 9 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 8 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 20 +-
.../kvm/resource/LibvirtCapXMLParser.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 861 +++---
.../hypervisor/kvm/resource/LibvirtConnection.java | 27 +-
.../kvm/resource/LibvirtDomainListener.java | 5 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 18 +-
.../kvm/resource/LibvirtExtendedVmStatsEntry.java | 51 -
.../kvm/resource/LibvirtKvmAgentHook.java | 15 +-
.../kvm/resource/LibvirtStoragePoolXMLParser.java | 11 +-
.../resource/LibvirtStorageVolumeXMLParser.java | 11 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 126 +-
.../hypervisor/kvm/resource/LibvirtXMLParser.java | 13 +-
.../hypervisor/kvm/resource/MigrateKVMAsync.java | 5 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 22 +-
.../hypervisor/kvm/resource/VRouterVifDriver.java | 11 +-
.../hypervisor/kvm/resource/VifDriverBase.java | 4 -
.../RollingMaintenanceAgentExecutor.java | 16 +-
.../RollingMaintenanceExecutorBase.java | 7 +-
.../RollingMaintenanceServiceExecutor.java | 12 +-
.../LibvirtBackupSnapshotCommandWrapper.java | 26 +-
.../LibvirtCheckAndRepairVolumeCommandWrapper.java | 11 +-
.../LibvirtCheckConvertInstanceCommandWrapper.java | 8 +-
.../wrapper/LibvirtCheckSshCommandWrapper.java | 10 +-
.../LibvirtCheckStorageAvailabilityWrapper.java | 8 +-
.../resource/wrapper/LibvirtCheckUrlCommand.java | 6 +-
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 5 +-
...nupPersistentNetworkResourceCommandWrapper.java | 2 +
.../LibvirtConsoleProxyLoadCommandWrapper.java | 6 +-
.../LibvirtConvertInstanceCommandWrapper.java | 242 +-
.../LibvirtCopyRemoteVolumeCommandWrapper.java | 7 +-
.../LibvirtCopyToSecondaryStorageWrapper.java | 4 +-
.../wrapper/LibvirtCopyVolumeCommandWrapper.java | 4 +-
.../wrapper/LibvirtCreateCommandWrapper.java | 4 +-
...ePrivateTemplateFromSnapshotCommandWrapper.java | 4 +-
...atePrivateTemplateFromVolumeCommandWrapper.java | 12 +-
.../LibvirtCreateVMSnapshotCommandWrapper.java | 6 +-
.../wrapper/LibvirtDeleteBackupCommandWrapper.java | 63 -
.../LibvirtDeleteVMSnapshotCommandWrapper.java | 18 +-
.../wrapper/LibvirtDestroyCommandWrapper.java | 4 +-
.../wrapper/LibvirtFenceCommandWrapper.java | 8 +-
.../wrapper/LibvirtFreezeThawVMCommandWrapper.java | 8 +-
.../wrapper/LibvirtGetHostStatsCommandWrapper.java | 2 +
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 16 +-
.../LibvirtGetStorageStatsCommandWrapper.java | 3 +-
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 14 +-
.../LibvirtGetVmDiskStatsCommandWrapper.java | 6 +-
.../LibvirtGetVmIpAddressCommandWrapper.java | 19 +-
.../LibvirtGetVmNetworkStatsCommandWrapper.java | 6 +-
.../wrapper/LibvirtGetVmStatsCommandWrapper.java | 6 +-
.../LibvirtGetVolumeStatCommandWrapper.java | 5 +-
.../LibvirtGetVolumeStatsCommandWrapper.java | 2 +
.../LibvirtHandleConfigDriveCommandWrapper.java | 20 +-
...bvirtImportConvertedInstanceCommandWrapper.java | 35 +-
.../LibvirtManageSnapshotCommandWrapper.java | 20 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 91 +-
.../LibvirtMigrateVolumeCommandWrapper.java | 26 +-
.../LibvirtModifySshKeysCommandWrapper.java | 20 +-
.../LibvirtModifyTargetsCommandWrapper.java | 2 +
.../LibvirtNetworkRulesSystemVmCommandWrapper.java | 4 +-
...irtNetworkRulesVmSecondaryIpCommandWrapper.java | 4 +-
.../LibvirtOvsCreateTunnelCommandWrapper.java | 8 +-
.../LibvirtOvsDestroyBridgeCommandWrapper.java | 4 +-
.../LibvirtOvsDestroyTunnelCommandWrapper.java | 8 +-
.../LibvirtOvsFetchInterfaceCommandWrapper.java | 7 +-
.../LibvirtOvsSetupBridgeCommandWrapper.java | 4 +-
...OvsVpcPhysicalTopologyConfigCommandWrapper.java | 6 +-
...irtOvsVpcRoutingPolicyConfigCommandWrapper.java | 6 +-
.../LibvirtPatchSystemVmCommandWrapper.java | 11 +-
.../wrapper/LibvirtPingTestCommandWrapper.java | 6 +-
.../wrapper/LibvirtPlugNicCommandWrapper.java | 10 +-
...ibvirtPostCertificateRenewalCommandWrapper.java | 6 +-
.../LibvirtPrepareForMigrationCommandWrapper.java | 14 +-
.../LibvirtPrepareStorageClientCommandWrapper.java | 6 +-
...irtPrepareUnmanageVMInstanceCommandWrapper.java | 8 +-
.../wrapper/LibvirtPvlanSetupCommandWrapper.java | 14 +-
.../wrapper/LibvirtReadyCommandWrapper.java | 9 +-
.../wrapper/LibvirtRebootCommandWrapper.java | 4 +-
.../wrapper/LibvirtReplugNicCommandWrapper.java | 12 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 22 +-
.../LibvirtRestoreBackupCommandWrapper.java | 213 --
.../LibvirtRestoreVMSnapshotCommandWrapper.java | 10 +-
.../LibvirtRevertSnapshotCommandWrapper.java | 20 +-
.../LibvirtRevertToVMSnapshotCommandWrapper.java | 6 +-
...virtRevokeDirectDownloadCertificateWrapper.java | 12 +-
.../LibvirtRollingMaintenanceCommandWrapper.java | 12 +-
.../LibvirtSecurityGroupRulesCommandWrapper.java | 8 +-
...tupDirectDownloadCertificateCommandWrapper.java | 23 +-
...ibvirtSetupPersistentNetworkCommandWrapper.java | 2 +
.../wrapper/LibvirtStartCommandWrapper.java | 22 +-
.../wrapper/LibvirtStopCommandWrapper.java | 20 +-
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 84 -
.../wrapper/LibvirtUnPlugNicCommandWrapper.java | 6 +-
...ibvirtUnprepareStorageClientCommandWrapper.java | 6 +-
.../resource/wrapper/LibvirtUtilitiesHelper.java | 9 +-
.../kvm/storage/FiberChannelAdapter.java | 11 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 59 +-
.../kvm/storage/IscsiStorageCleanupMonitor.java | 27 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 20 -
.../kvm/storage/KVMStoragePoolManager.java | 94 +-
.../kvm/storage/KVMStorageProcessor.java | 462 ++--
.../kvm/storage/LibvirtStorageAdaptor.java | 340 +--
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 60 +-
.../kvm/storage/ManagedNfsStorageAdaptor.java | 34 +-
.../kvm/storage/MultipathSCSIAdapterBase.java | 14 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 93 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 9 -
.../hypervisor/kvm/storage/StorageAdaptorInfo.java | 3 +
.../apache/cloudstack/kvm/ha/KVMHAProvider.java | 18 +-
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 49 +-
.../org/apache/cloudstack/utils/linux/CPUStat.java | 9 +-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 54 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 5 +-
.../kvm-compute/spring-kvm-compute-context.xml | 2 +-
.../cloud/hypervisor/kvm/dpdk/DpdkDriverTest.java | 10 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 288 +-
.../kvm/resource/LibvirtCpuTopologyTest.java | 94 -
.../kvm/resource/LibvirtDomainXMLParserTest.java | 7 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 75 -
.../LibvirtConvertInstanceCommandWrapperTest.java | 70 -
...tImportConvertedInstanceCommandWrapperTest.java | 2 +-
.../LibvirtMigrateVolumeCommandWrapperTest.java | 8 +-
.../kvm/storage/LibvirtStorageAdaptorTest.java | 94 +-
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 2 +-
.../kvm/storage/ScaleIOStoragePoolTest.java | 7 +-
.../apache/cloudstack/kvm/ha/KVMHostHATest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/hypervisors/ovm/pom.xml | 2 +-
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 22 +-
.../java/com/cloud/ovm/hypervisor/OvmFencer.java | 16 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 111 +-
.../main/java/com/cloud/ovm/object/Connection.java | 9 +-
.../ovm-compute/spring-ovm-compute-context.xml | 2 +-
.../spring-ovm-discoverer-context.xml | 2 +-
.../scripts/vm/hypervisor/ovm/ConfigFileOps.py | 2 +-
.../scripts/vm/hypervisor/ovm/OvmCommonModule.py | 4 +-
.../main/scripts/vm/hypervisor/ovm/configureOvm.sh | 4 +-
plugins/hypervisors/ovm3/pom.xml | 10 +-
.../main/java/com/cloud/ha/Ovm3Investigator.java | 8 +-
.../hypervisor/ovm3/objects/CloudstackPlugin.java | 9 +-
.../cloud/hypervisor/ovm3/objects/Connection.java | 21 +-
.../com/cloud/hypervisor/ovm3/objects/Linux.java | 5 +-
.../com/cloud/hypervisor/ovm3/objects/Network.java | 8 +-
.../cloud/hypervisor/ovm3/objects/OvmObject.java | 10 +-
.../com/cloud/hypervisor/ovm3/objects/Pool.java | 3 +
.../cloud/hypervisor/ovm3/objects/PoolOCFS2.java | 5 +-
.../cloud/hypervisor/ovm3/objects/Repository.java | 2 +
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 28 +-
.../hypervisor/ovm3/resources/Ovm3Discoverer.java | 54 +-
.../ovm3/resources/Ovm3FenceBuilder.java | 14 +-
.../ovm3/resources/Ovm3HypervisorGuru.java | 4 +-
.../ovm3/resources/Ovm3HypervisorResource.java | 58 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 135 +-
.../ovm3/resources/Ovm3VirtualRoutingResource.java | 6 +-
.../ovm3/resources/helpers/Ovm3Configuration.java | 12 +-
.../resources/helpers/Ovm3HypervisorNetwork.java | 40 +-
.../resources/helpers/Ovm3HypervisorSupport.java | 101 +-
.../ovm3/resources/helpers/Ovm3StoragePool.java | 92 +-
.../helpers/Ovm3VirtualRoutingSupport.java | 24 +-
.../ovm3/resources/helpers/Ovm3VmSupport.java | 65 +-
.../hypervisor/ovm3/objects/ConnectionTest.java | 10 +-
.../test/resources/scripts/create_pool_cluster.py | 6 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 26 +-
.../agent/manager/MockNetworkManagerImpl.java | 16 +-
.../cloud/agent/manager/MockStorageManager.java | 3 -
.../agent/manager/MockStorageManagerImpl.java | 42 +-
.../com/cloud/agent/manager/MockVmManagerImpl.java | 32 +-
.../cloud/agent/manager/SimulatorManagerImpl.java | 19 +-
.../api/commands/CleanupSimulatorMockCmd.java | 2 +
.../cloud/api/commands/ConfigureSimulatorCmd.java | 2 +
.../cloud/api/commands/QuerySimulatorMockCmd.java | 2 +
.../main/java/com/cloud/ha/SimulatorFencer.java | 16 +-
.../java/com/cloud/ha/SimulatorInvestigator.java | 12 +-
.../java/com/cloud/resource/AgentResourceBase.java | 21 +-
.../com/cloud/resource/AgentRoutingResource.java | 10 +-
.../com/cloud/resource/AgentStorageResource.java | 4 +-
.../com/cloud/resource/SimulatorDiscoverer.java | 28 +-
.../resource/SimulatorSecondaryDiscoverer.java | 4 +-
.../cloud/resource/SimulatorStorageProcessor.java | 9 +-
.../com/cloud/simulator/MockStoragePoolVO.java | 6 +-
.../simulator/dao/MockConfigurationDaoImpl.java | 4 +-
.../simulator/dao/MockStoragePoolDaoImpl.java | 2 +-
.../com/cloud/simulator/dao/MockVolumeDao.java | 2 -
.../com/cloud/simulator/dao/MockVolumeDaoImpl.java | 12 -
.../apache/cloudstack/ha/SimulatorHAProvider.java | 4 +-
.../driver/SimulatorImageStoreDriverImpl.java | 4 +-
.../SimulatorImageStoreLifeCycleImpl.java | 7 +-
.../spring-simulator-discover-context.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
.../java/com/cloud/ucs/manager/UcsManagerImpl.java | 15 +-
.../apache/cloudstack/api/AddUcsManagerCmd.java | 4 +-
.../api/AssociateUcsProfileToBladeCmd.java | 4 +-
.../apache/cloudstack/api/DeleteUcsManagerCmd.java | 2 +
.../org/apache/cloudstack/api/ListUcsBladeCmd.java | 4 +-
.../apache/cloudstack/api/ListUcsManagerCmd.java | 4 +-
.../apache/cloudstack/api/ListUcsProfileCmd.java | 4 +-
.../cloudstack/core/spring-ucs-core-context.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 2 +
.../api/commands/DisableCiscoNexusVSMCmd.java | 2 +
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 2 +
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 2 +
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 140 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 23 +-
.../cloud/hypervisor/vmware/VmwareCleanupMaid.java | 9 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 74 +-
.../hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 2 +
.../manager/CleanupFullyClonedTemplatesTask.java | 34 +-
.../vmware/manager/VmwareManagerImpl.java | 228 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 189 +-
.../vmware/resource/VmwareContextFactory.java | 11 +-
.../hypervisor/vmware/resource/VmwareResource.java | 857 +++---
.../network/CiscoNexusVSMDeviceManagerImpl.java | 8 +-
.../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 +
.../network/element/CiscoNexusVSMElement.java | 10 +-
.../resource/PremiumSecondaryStorageResource.java | 14 +-
.../VmwareSecondaryStorageContextFactory.java | 7 +-
.../VmwareSecondaryStorageResourceHandler.java | 43 +-
.../resource/VmwareStorageLayoutHelper.java | 33 +-
.../storage/resource/VmwareStorageProcessor.java | 287 +-
.../VmwareStorageSubsystemCommandHandler.java | 12 +-
.../api/command/admin/zone/AddVmwareDcCmd.java | 6 +-
.../api/command/admin/zone/ListVmwareDcsCmd.java | 2 +
.../api/command/admin/zone/RemoveVmwareDcCmd.java | 4 +-
.../motion/VmwareStorageMotionStrategy.java | 64 +-
.../spring-vmware-compute-context.xml | 2 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../main/java/com/cloud/ha/XenServerFencer.java | 18 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 6 +-
.../xenserver/discoverer/XcpServerDiscoverer.java | 75 +-
.../xenserver/resource/CitrixResourceBase.java | 1230 +++++----
.../xenserver/resource/XcpServerResource.java | 6 +-
.../xenserver/resource/XenServer56Resource.java | 14 +-
.../xenserver/resource/XenServer610Resource.java | 4 +-
.../xenserver/resource/XenServer620Resource.java | 4 +-
.../resource/XenServer620SP1Resource.java | 14 +-
.../resource/XenServerConnectionPool.java | 57 +-
.../resource/XenServerStorageProcessor.java | 137 +-
.../xenserver/resource/Xenserver625Resource.java | 6 +-
.../resource/Xenserver625StorageProcessor.java | 96 +-
.../xenserver/resource/XsLocalNetwork.java | 9 +-
...XcpServerGetAutoScaleMetricsCommandWrapper.java | 4 +-
.../xcp/XcpServerNetworkUsageCommandWrapper.java | 4 +-
.../XenServer56CheckOnHostCommandWrapper.java | 4 +-
.../xen56/XenServer56FenceCommandWrapper.java | 14 +-
...nServer56GetAutoScaleMetricsCommandWrapper.java | 4 +-
.../XenServer56NetworkUsageCommandWrapper.java | 6 +-
.../xen56p1/XenServer56FP1FenceCommandWrapper.java | 14 +-
.../XenServer610MigrateVolumeCommandWrapper.java | 4 +-
...nServer610MigrateWithStorageCommandWrapper.java | 10 +-
...10MigrateWithStorageCompleteCommandWrapper.java | 6 +-
...610MigrateWithStorageReceiveCommandWrapper.java | 6 +-
...ver610MigrateWithStorageSendCommandWrapper.java | 12 +-
.../XenServer620SP1GetGPUStatsCommandWrapper.java | 4 +-
.../xenbase/CitrixAttachIsoCommandWrapper.java | 6 +-
...ixAttachOrDettachConfigDriveCommandWrapper.java | 12 +-
.../CitrixCheckGuestOsMappingCommandWrapper.java | 11 +-
.../xenbase/CitrixCheckNetworkCommandWrapper.java | 12 +-
.../xenbase/CitrixCheckSshCommandWrapper.java | 10 +-
.../CitrixCheckVirtualMachineCommandWrapper.java | 4 +-
.../CitrixCleanupNetworkRulesCmdWrapper.java | 6 +-
...nupPersistentNetworkResourceCommandWrapper.java | 4 +-
.../CitrixClusterVMMetaDataSyncCommandWrapper.java | 4 +-
.../CitrixConsoleProxyLoadCommandWrapper.java | 6 +-
...itrixCoppyToSecondaryStorageCommandWrapper.java | 4 +-
.../xenbase/CitrixCreateCommandWrapper.java | 6 +-
.../CitrixCreateStoragePoolCommandWrapper.java | 4 +-
.../CitrixCreateVMSnapshotCommandWrapper.java | 18 +-
.../CitrixDeleteStoragePoolCommandWrapper.java | 4 +-
.../CitrixDeleteVMSnapshotCommandWrapper.java | 6 +-
.../xenbase/CitrixDestroyCommandWrapper.java | 8 +-
.../xenbase/CitrixGetHostStatsCommandWrapper.java | 4 +-
...rixGetHypervisorGuestOsNamesCommandWrapper.java | 7 +-
.../CitrixGetStorageStatsCommandWrapper.java | 10 +-
.../CitrixGetVmIpAddressCommandWrapper.java | 13 +-
.../xenbase/CitrixGetVmStatsCommandWrapper.java | 6 +-
.../xenbase/CitrixGetVncPortCommandWrapper.java | 4 +-
.../CitrixGetVolumeStatsCommandWrapper.java | 6 +-
.../CitrixListDataStoreObjectsCommandWrapper.java | 9 +-
.../xenbase/CitrixMaintainCommandWrapper.java | 8 +-
.../xenbase/CitrixMigrateCommandWrapper.java | 12 +-
.../CitrixModifyStoragePoolCommandWrapper.java | 12 +-
.../CitrixNetworkElementCommandWrapper.java | 2 +
.../CitrixOvsCreateGreTunnelCommandWrapper.java | 8 +-
.../CitrixOvsCreateTunnelCommandWrapper.java | 8 +-
.../xenbase/CitrixOvsDeleteFlowCommandWrapper.java | 8 +-
.../CitrixOvsDestroyBridgeCommandWrapper.java | 6 +-
.../CitrixOvsDestroyTunnelCommandWrapper.java | 6 +-
.../CitrixOvsFetchInterfaceCommandWrapper.java | 14 +-
.../CitrixOvsSetTagAndFlowCommandWrapper.java | 10 +-
.../CitrixOvsSetupBridgeCommandWrapper.java | 4 +-
...OvsVpcPhysicalTopologyConfigCommandWrapper.java | 4 +-
...rixOvsVpcRoutingPolicyConfigCommandWrapper.java | 4 +-
.../xenbase/CitrixPatchSystemVmCommandWrapper.java | 10 +-
.../xenbase/CitrixPlugNicCommandWrapper.java | 8 +-
.../CitrixPrepareForMigrationCommandWrapper.java | 10 +-
...CitrixPrimaryStorageDownloadCommandWrapper.java | 6 +-
.../xenbase/CitrixPvlanSetupCommandWrapper.java | 16 +-
.../wrapper/xenbase/CitrixReadyCommandWrapper.java | 6 +-
.../xenbase/CitrixRebootCommandWrapper.java | 12 +-
.../xenbase/CitrixResizeVolumeCommandWrapper.java | 8 +-
.../CitrixRevertToVMSnapshotCommandWrapper.java | 14 +-
.../xenbase/CitrixScaleVmCommandWrapper.java | 14 +-
.../CitrixSecurityGroupRulesCommandWrapper.java | 12 +-
.../wrapper/xenbase/CitrixSetupCommandWrapper.java | 38 +-
...CitrixSetupPersistentNetworkCommandWrapper.java | 4 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 34 +-
.../wrapper/xenbase/CitrixStopCommandWrapper.java | 24 +-
.../xenbase/CitrixUnPlugNicCommandWrapper.java | 4 +-
.../CitrixUpdateHostPasswordCommandWrapper.java | 4 +-
.../CitrixUpgradeSnapshotCommandWrapper.java | 4 +-
.../xenserver/ExtraConfigurationUtility.java | 35 +-
.../xenserver/XenServerResourceNewBase.java | 36 +-
.../motion/XenServerStorageMotionStrategy.java | 45 +-
.../com/cloud/hypervisor/XenServerGuruTest.java | 2 +-
.../discoverer/XcpServerDiscovererTest.java | 2 +-
.../xenbase/CitrixMigrateCommandWrapperTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/integrations/cloudian/pom.xml | 2 +-
.../cloudstack/cloudian/CloudianConnectorImpl.java | 46 +-
.../cloudstack/cloudian/client/CloudianClient.java | 49 +-
.../cloudstack/cloudian/client/CloudianUtils.java | 15 +-
.../cloudstack/cloudian/CloudianUtilsTest.java | 87 -
plugins/integrations/kubernetes-service/pom.xml | 11 +-
.../cluster/KubernetesClusterManagerImpl.java | 263 +-
.../cluster/KubernetesClusterService.java | 3 -
.../kubernetes/cluster/KubernetesClusterVO.java | 8 -
.../cluster/KubernetesServiceHelperImpl.java | 22 +-
.../KubernetesClusterActionWorker.java | 86 +-
.../KubernetesClusterDestroyWorker.java | 62 +-
...ernetesClusterResourceModifierActionWorker.java | 273 +-
.../KubernetesClusterScaleWorker.java | 43 +-
.../KubernetesClusterStartWorker.java | 72 +-
.../actionworkers/KubernetesClusterStopWorker.java | 9 +-
.../KubernetesClusterUpgradeWorker.java | 28 +-
.../cluster/dao/KubernetesClusterVmMapDao.java | 2 -
.../cluster/dao/KubernetesClusterVmMapDaoImpl.java | 12 -
.../cluster/utils/KubernetesClusterUtil.java | 57 +-
.../version/KubernetesSupportedVersionVO.java | 8 -
.../version/KubernetesVersionManagerImpl.java | 18 +-
.../version/AddKubernetesSupportedVersionCmd.java | 12 +-
.../DeleteKubernetesSupportedVersionCmd.java | 2 +
.../UpdateKubernetesSupportedVersionCmd.java | 2 +
.../AddVirtualMachinesToKubernetesClusterCmd.java | 2 +
.../cluster/CreateKubernetesClusterCmd.java | 6 +-
.../cluster/DeleteKubernetesClusterCmd.java | 5 +-
.../cluster/GetKubernetesClusterConfigCmd.java | 2 +
.../cluster/ListKubernetesClustersCmd.java | 2 +
...oveVirtualMachinesFromKubernetesClusterCmd.java | 2 +
.../cluster/ScaleKubernetesClusterCmd.java | 5 +-
.../cluster/StartKubernetesClusterCmd.java | 2 +
.../cluster/StopKubernetesClusterCmd.java | 5 +-
.../cluster/UpgradeKubernetesClusterCmd.java | 5 +-
.../ListKubernetesSupportedVersionsCmd.java | 2 +
.../main/resources/conf/k8s-control-node-add.yml | 2 +-
.../src/main/resources/conf/k8s-control-node.yml | 2 +-
.../src/main/resources/conf/k8s-node.yml | 2 +-
.../main/resources/script/upgrade-kubernetes.sh | 2 +-
.../version/KubernetesVersionServiceTest.java | 2 -
.../org.mockito.plugins.MockMaker | 1 +
plugins/integrations/prometheus/pom.xml | 2 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 37 +-
.../metrics/PrometheusExporterServerImpl.java | 18 +-
plugins/metrics/pom.xml | 2 +-
.../org/apache/cloudstack/api/MetricConstants.java | 2 +-
.../apache/cloudstack/metrics/MetricsService.java | 8 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 190 +-
.../response/ManagementServerMetricsResponse.java | 2 +-
.../cloudstack/response/VolumeMetricsResponse.java | 2 +-
.../cloudstack/metrics/MetricsServiceImplTest.java | 10 +-
.../response/HostMetricsResponseTest.java | 23 -
plugins/network-elements/bigswitch/pom.xml | 2 +-
.../api/commands/ListBigSwitchBcfDevicesCmd.java | 2 +
.../com/cloud/network/BigSwitchBcfDeviceVO.java | 8 -
.../cloud/network/bigswitch/BigSwitchBcfApi.java | 19 +-
.../cloud/network/bigswitch/BigSwitchBcfUtils.java | 11 +-
.../cloud/network/element/BigSwitchBcfElement.java | 33 +-
.../network/guru/BigSwitchBcfGuestNetworkGuru.java | 26 +-
.../network/resource/BigSwitchBcfResource.java | 18 +-
.../cloud/network/bigswitch/BigSwitchApiTest.java | 2 +-
.../network/bigswitch/BigSwitchBcfUtilsTest.java | 9 +-
.../network/resource/BigSwitchBcfResourceTest.java | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 4 +-
.../commands/ListBrocadeVcsDeviceNetworksCmd.java | 2 +
.../com/cloud/network/brocade/BrocadeVcsApi.java | 37 +-
.../cloud/network/element/BrocadeVcsElement.java | 18 +-
.../network/guru/BrocadeVcsGuestNetworkGuru.java | 39 +-
.../cloud/network/resource/BrocadeVcsResource.java | 13 +-
.../META-INF/cloudstack/vcs/spring-vcs-context.xml | 18 +-
.../guru/BrocadeVcsGuestNetworkGuruTest.java | 14 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
.../api/commands/AddCiscoAsa1000vResourceCmd.java | 2 +
.../api/commands/AddCiscoVnmcResourceCmd.java | 2 +
.../commands/DeleteCiscoAsa1000vResourceCmd.java | 2 +
.../api/commands/DeleteCiscoVnmcResourceCmd.java | 2 +
.../commands/ListCiscoAsa1000vResourcesCmd.java | 2 +
.../api/commands/ListCiscoVnmcResourcesCmd.java | 2 +
.../network/cisco/CiscoVnmcConnectionImpl.java | 9 +-
.../cloud/network/cisco/CiscoVnmcControllerVO.java | 9 -
.../cloud/network/element/CiscoVnmcElement.java | 102 +-
.../cloud/network/resource/CiscoVnmcResource.java | 29 +-
.../network/cisco/associate-acl-policy-set.xml | 2 +-
.../scripts/network/cisco/create-dhcp-policy.xml | 14 +-
.../scripts/network/cisco/create-edge-firewall.xml | 2 +-
.../network/cisco/create-nat-policy-ref.xml | 2 +-
.../network/cisco/create-source-nat-pool.xml | 2 +-
.../network/cisco/create-source-nat-rule.xml | 6 +-
.../network/element/CiscoVnmcElementTest.java | 4 +-
.../network/resource/CiscoVnmcResourceTest.java | 6 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../src/main/resources/components-example.xml | 4 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
.../element/ElasticLoadBalancerElement.java | 10 +-
.../network/lb/ElasticLoadBalancerManager.java | 2 -
.../network/lb/ElasticLoadBalancerManagerImpl.java | 54 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 55 +-
.../cloud/network/lb/dao/ElasticLbVmMapDao.java | 2 -
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 13 -
.../org.mockito.plugins.MockMaker | 1 +
plugins/network-elements/globodns/pom.xml | 7 +-
.../cloudstack/element/GloboDnsElement.java | 6 +-
.../cloudstack/resource/GloboDnsResource.java | 32 +-
.../cloudstack/element/GloboDnsElementTest.java | 4 +-
.../cloudstack/resource/GloboDnsResourceTest.java | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
.../element/InternalLoadBalancerElement.java | 59 +-
.../network/lb/InternalLoadBalancerVMManager.java | 2 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 110 +-
.../core/spring-internallb-core-context.xml | 2 +-
.../InternalLbElementServiceTest.java | 4 +-
.../internallbelement/InternalLbElementTest.java | 6 +-
.../internallbvmmgr/InternalLBVMManagerTest.java | 12 +-
.../internallbvmmgr/InternalLBVMServiceTest.java | 4 +-
.../src/test/resources/lb_element.xml | 20 +-
.../src/test/resources/lb_mgr.xml | 24 +-
.../src/test/resources/lb_svc.xml | 26 +-
plugins/network-elements/juniper-contrail/pom.xml | 6 +-
.../contrail/management/ContrailElementImpl.java | 129 +-
.../network/contrail/management/ContrailGuru.java | 59 +-
.../contrail/management/ContrailManagerImpl.java | 56 +-
.../management/ContrailVpcElementImpl.java | 35 +-
.../network/contrail/management/DBSyncGeneric.java | 25 +-
.../network/contrail/management/EventUtils.java | 44 +-
.../contrail/management/ManagementNetworkGuru.java | 12 +-
.../contrail/management/ServerDBSyncImpl.java | 107 +-
.../management/ServerEventHandlerImpl.java | 53 +-
.../contrail/management/ServiceManagerImpl.java | 25 +-
.../network/contrail/model/FloatingIpModel.java | 10 +-
.../contrail/model/FloatingIpPoolModel.java | 8 +-
.../network/contrail/model/InstanceIpModel.java | 4 +-
.../network/contrail/model/ModelObject.java | 5 +-
.../network/contrail/model/ModelObjectBase.java | 4 -
.../network/contrail/model/NetworkPolicyModel.java | 12 +-
.../contrail/model/ServiceInstanceModel.java | 18 +-
.../network/contrail/model/VMInterfaceModel.java | 6 +-
.../contrail/model/VirtualMachineModel.java | 24 +-
.../contrail/model/VirtualNetworkModel.java | 35 +-
.../contrail/management/ApiConnectorMockito.java | 13 +
.../management/IntegrationTestConfiguration.java | 18 +-
.../contrail/management/ManagementServerMock.java | 20 +-
.../contrail/management/MockAccountManager.java | 22 +-
.../contrail/management/NetworkProviderTest.java | 15 +-
.../contrail/management/PublicNetworkTest.java | 6 +
.../contrail/model/InstanceIpModelTest.java | 9 +-
.../contrail/model/VMInterfaceModelTest.java | 9 +-
.../contrail/model/VirtualMachineModelTest.java | 6 +-
.../contrail/model/VirtualNetworkModelTest.java | 4 +
.../src/test/resources/commonContext.xml | 20 +-
.../src/test/resources/mysql_db_start.sh | 2 +-
.../src/test/resources/providerContext.xml | 2 +-
.../src/test/resources/publicNetworkContext.xml | 20 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
.../api/commands/AddNetscalerLoadBalancerCmd.java | 2 +
.../ConfigureNetscalerLoadBalancerCmd.java | 2 +
.../commands/DeleteNetscalerControlCenterCmd.java | 2 +
.../commands/DeleteNetscalerLoadBalancerCmd.java | 2 +
.../commands/DeleteServicePackageOfferingCmd.java | 2 +
.../cloud/api/commands/DeployNetscalerVpxCmd.java | 2 +
.../commands/ListNetscalerControlCenterCmd.java | 2 +
.../ListNetscalerLoadBalancerNetworksCmd.java | 2 +
.../commands/ListNetscalerLoadBalancersCmd.java | 2 +
.../commands/ListRegisteredServicePackageCmd.java | 2 +
.../RegisterNetscalerControlCenterCmd.java | 5 +
.../api/commands/RegisterServicePackageCmd.java | 2 +
.../com/cloud/api/commands/StopNetScalerVMCmd.java | 2 +
.../cloud/network/element/NetscalerElement.java | 68 +-
.../resource/NetScalerControlCenterResource.java | 127 +-
.../cloud/network/resource/NetscalerResource.java | 225 +-
.../cloud/network/vm/NetScalerVMManagerImpl.java | 22 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 2 +
.../cloud/network/element/NiciraNvpElement.java | 72 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 42 +-
.../com/cloud/network/nicira/NiciraNvpTag.java | 9 +-
.../com/cloud/network/nicira/NiciraRestClient.java | 10 +-
.../cloud/network/resource/NiciraNvpResource.java | 11 +-
.../wrapper/NiciraCheckHealthCommandWrapper.java | 6 +-
...ConfigurePortForwardingRulesCommandWrapper.java | 18 +-
...vpConfigureSharedNetworkUuidCommandWrapper.java | 58 +-
...ConfigureSharedNetworkVlanIdCommandWrapper.java | 28 +-
...raNvpConfigureStaticNatRulesCommandWrapper.java | 18 +-
...NiciraNvpCreateLogicalRouterCommandWrapper.java | 4 +-
...raNvpCreateLogicalSwitchPortCommandWrapper.java | 4 +-
...raNvpDeleteLogicalRouterPortCommandWrapper.java | 4 +-
...iciraNvpFindL2GatewayServiceCommandWrapper.java | 6 +-
...ciraNvpFindLogicalRouterPortCommandWrapper.java | 6 +-
.../cloud/network/utils/CommandRetryUtility.java | 7 +-
.../network/element/NiciraNvpElementTest.java | 8 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 14 +-
.../com/cloud/network/nicira/NiciraNvpApiTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/network-elements/nsx/pom.xml | 65 -
.../main/java/org/apache/cloudstack/NsxAnswer.java | 41 -
.../org/apache/cloudstack/StartupNsxCommand.java | 26 -
.../agent/api/CreateNsxDhcpRelayConfigCommand.java | 77 -
.../CreateNsxDistributedFirewallRulesCommand.java | 67 -
.../api/CreateNsxLoadBalancerRuleCommand.java | 87 -
.../agent/api/CreateNsxPortForwardRuleCommand.java | 71 -
.../agent/api/CreateNsxSegmentCommand.java | 79 -
.../agent/api/CreateNsxStaticNatCommand.java | 25 -
.../agent/api/CreateNsxTier1GatewayCommand.java | 67 -
.../api/CreateOrUpdateNsxTier1NatRuleCommand.java | 69 -
.../DeleteNsxDistributedFirewallRulesCommand.java | 27 -
.../api/DeleteNsxLoadBalancerRuleCommand.java | 58 -
.../agent/api/DeleteNsxNatRuleCommand.java | 73 -
.../agent/api/DeleteNsxSegmentCommand.java | 70 -
.../agent/api/DeleteNsxTier1GatewayCommand.java | 63 -
.../apache/cloudstack/agent/api/NsxCommand.java | 67 -
.../cloudstack/agent/api/NsxNetworkCommand.java | 117 -
.../cloudstack/agent/api/StartupNsxCommand.java | 27 -
.../api/command/AddNsxControllerCmd.java | 130 -
.../api/command/DeleteNsxControllerCmd.java | 87 -
.../api/command/ListNsxControllersCmd.java | 68 -
.../api/response/NsxControllerResponse.java | 136 -
.../cloudstack/resource/NsxLoadBalancerMember.java | 41 -
.../apache/cloudstack/resource/NsxNetworkRule.java | 397 ---
.../apache/cloudstack/resource/NsxOpObject.java | 129 -
.../apache/cloudstack/resource/NsxResource.java | 500 ----
.../apache/cloudstack/service/NsxApiClient.java | 1113 --------
.../org/apache/cloudstack/service/NsxElement.java | 956 -------
.../cloudstack/service/NsxGuestNetworkGuru.java | 342 ---
.../cloudstack/service/NsxProviderService.java | 35 -
.../cloudstack/service/NsxProviderServiceImpl.java | 213 --
.../cloudstack/service/NsxPublicNetworkGuru.java | 170 --
.../apache/cloudstack/service/NsxServiceImpl.java | 203 --
.../cloudstack/utils/NsxControllerUtils.java | 151 --
.../org/apache/cloudstack/utils/NsxHelper.java | 53 -
.../core/spring-nsx-core-managers-context.xml | 32 -
.../META-INF/cloudstack/nsx/module.properties | 21 -
.../META-INF/cloudstack/nsx/spring-nsx-context.xml | 39 -
.../cloudstack/resource/NsxResourceTest.java | 293 ---
.../cloudstack/service/NsxApiClientTest.java | 111 -
.../apache/cloudstack/service/NsxElementTest.java | 497 ----
.../service/NsxGuestNetworkGuruTest.java | 329 ---
.../service/NsxProviderServiceImplTest.java | 174 --
.../service/NsxPublicNetworkGuruTest.java | 178 --
.../cloudstack/service/NsxServiceImplTest.java | 162 --
.../cloudstack/utils/NsxControllerUtilsTest.java | 198 --
plugins/network-elements/opendaylight/pom.xml | 2 +-
.../network/opendaylight/OpendaylightElement.java | 2 +
.../opendaylight/OpendaylightGuestNetworkGuru.java | 38 +-
.../agent/OpenDaylightControllerResource.java | 25 +-
.../OpenDaylightControllerResourceManagerImpl.java | 13 +-
.../network/opendaylight/api/NeutronRestApi.java | 25 +-
.../network/opendaylight/api/resources/Action.java | 27 +-
plugins/network-elements/ovs/pom.xml | 2 +-
.../java/com/cloud/network/element/OvsElement.java | 64 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 18 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 149 +-
.../ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java | 2 +
plugins/network-elements/palo-alto/pom.xml | 2 +-
.../cloud/api/commands/AddPaloAltoFirewallCmd.java | 2 +
.../api/commands/ConfigurePaloAltoFirewallCmd.java | 2 +
.../api/commands/DeletePaloAltoFirewallCmd.java | 2 +
.../commands/ListPaloAltoFirewallNetworksCmd.java | 2 +
.../api/commands/ListPaloAltoFirewallsCmd.java | 2 +
.../element/PaloAltoExternalFirewallElement.java | 16 +-
.../cloud/network/resource/PaloAltoResource.java | 71 +-
.../network/resource/PaloAltoResourceTest.java | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
.../apache/cloudstack/api/commands/AddSspCmd.java | 4 +-
.../cloudstack/api/commands/DeleteSspCmd.java | 4 +-
.../cloudstack/network/dao/SspUuidDaoImpl.java | 2 +
.../cloudstack/network/element/SspClient.java | 19 +-
.../cloudstack/network/element/SspElement.java | 72 +-
.../network/guru/SspGuestNetworkGuru.java | 22 +-
plugins/network-elements/tungsten/pom.xml | 11 +-
...stenFabricNetworkGatewayToLogicalRouterCmd.java | 2 +
.../command/AddTungstenFabricPolicyRuleCmd.java | 2 +
.../api/command/ApplyTungstenFabricPolicyCmd.java | 2 +
.../api/command/ApplyTungstenFabricTagCmd.java | 2 +
.../command/ConfigTungstenFabricServiceCmd.java | 10 +-
.../CreateTungstenFabricAddressGroupCmd.java | 2 +
...reateTungstenFabricApplicationPolicySetCmd.java | 2 +
.../CreateTungstenFabricFirewallPolicyCmd.java | 2 +
.../CreateTungstenFabricFirewallRuleCmd.java | 2 +
.../CreateTungstenFabricLogicalRouterCmd.java | 2 +
.../CreateTungstenFabricManagementNetworkCmd.java | 2 +
.../api/command/CreateTungstenFabricPolicyCmd.java | 2 +
.../command/CreateTungstenFabricProviderCmd.java | 2 +
.../CreateTungstenFabricPublicNetworkCmd.java | 2 +
.../CreateTungstenFabricServiceGroupCmd.java | 2 +
.../api/command/CreateTungstenFabricTagCmd.java | 2 +
.../command/CreateTungstenFabricTagTypeCmd.java | 2 +
.../DeleteTungstenFabricAddressGroupCmd.java | 2 +
...eleteTungstenFabricApplicationPolicySetCmd.java | 2 +
.../DeleteTungstenFabricFirewallPolicyCmd.java | 2 +
.../DeleteTungstenFabricFirewallRuleCmd.java | 2 +
.../DeleteTungstenFabricLogicalRouterCmd.java | 2 +
.../api/command/DeleteTungstenFabricPolicyCmd.java | 2 +
.../DeleteTungstenFabricServiceGroupCmd.java | 2 +
.../api/command/DeleteTungstenFabricTagCmd.java | 2 +
.../command/DeleteTungstenFabricTagTypeCmd.java | 2 +
.../command/GetLoadBalancerSslCertificateCmd.java | 2 +
.../command/ListTungstenFabricAddressGroupCmd.java | 2 +
.../ListTungstenFabricApplictionPolicySetCmd.java | 2 +
.../ListTungstenFabricFirewallPolicyCmd.java | 2 +
.../command/ListTungstenFabricFirewallRuleCmd.java | 2 +
.../ListTungstenFabricLBHealthMonitorCmd.java | 2 +
.../ListTungstenFabricLogicalRouterCmd.java | 2 +
.../api/command/ListTungstenFabricNetworkCmd.java | 2 +
.../api/command/ListTungstenFabricNicCmd.java | 2 +
.../api/command/ListTungstenFabricPolicyCmd.java | 2 +
.../command/ListTungstenFabricPolicyRuleCmd.java | 2 +
.../command/ListTungstenFabricProvidersCmd.java | 2 +
.../command/ListTungstenFabricServiceGroupCmd.java | 2 +
.../api/command/ListTungstenFabricTagCmd.java | 2 +
.../api/command/ListTungstenFabricTagTypeCmd.java | 2 +
.../api/command/ListTungstenFabricVmCmd.java | 2 +
...enFabricNetworkGatewayFromLogicalRouterCmd.java | 2 +
.../api/command/RemoveTungstenFabricPolicyCmd.java | 2 +
.../command/RemoveTungstenFabricPolicyRuleCmd.java | 2 +
.../api/command/RemoveTungstenFabricTagCmd.java | 2 +
.../command/SynchronizeTungstenFabricDataCmd.java | 2 +
.../UpdateTungstenFabricLBHealthMonitorCmd.java | 2 +
.../tungsten/resource/TungstenResource.java | 11 +-
.../network/tungsten/service/TungstenApi.java | 27 +-
.../network/tungsten/service/TungstenElement.java | 13 +-
.../tungsten/service/TungstenFabricUtils.java | 9 +-
.../tungsten/service/TungstenGuestNetworkGuru.java | 13 +-
.../tungsten/service/TungstenServiceImpl.java | 44 +-
.../tungsten/service/TungstenVRouterApi.java | 7 +-
.../vrouter/IntrospectApiConnectorImpl.java | 11 +-
.../tungsten/vrouter/VRouterApiConnectorImpl.java | 19 +-
.../network/tungsten/service/TungstenApiTest.java | 699 +++--
.../service/TungstenGuestNetworkGuruTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/network-elements/vxlan/pom.xml | 2 +-
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 10 +-
.../network/guru/VxlanGuestNetworkGuruTest.java | 8 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../IpmitoolOutOfBandManagementDriver.java | 20 +-
.../driver/ipmitool/IpmitoolWrapper.java | 29 +-
.../driver/ipmitool/IpmitoolWrapperTest.java | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../NestedCloudStackOutOfBandManagementDriver.java | 6 +-
...tedCloudStackOutOfBandManagementDriverTest.java | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 7 +-
plugins/shutdown/pom.xml | 2 +-
.../cloudstack/api/command/CancelShutdownCmd.java | 2 +
.../api/command/PrepareForShutdownCmd.java | 2 +
.../api/command/ReadyForShutdownCmd.java | 2 +
.../cloudstack/api/command/TriggerShutdownCmd.java | 2 +
.../cloudstack/shutdown/ShutdownManagerImpl.java | 3 +
plugins/storage-allocators/random/pom.xml | 2 +-
.../allocator/RandomStoragePoolAllocator.java | 12 +-
plugins/storage/image/default/pom.xml | 2 +-
.../driver/CloudStackImageStoreDriverImpl.java | 12 +-
.../CloudStackImageStoreLifeCycleImpl.java | 7 +-
.../spring-storage-image-default-context.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
.../datastore/driver/S3ImageStoreDriverImpl.java | 8 +-
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 7 +-
.../spring-storage-image-s3-context.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
.../driver/SwiftImageStoreDriverImpl.java | 8 +-
.../lifecycle/SwiftImageStoreLifeCycleImpl.java | 7 +-
.../spring-storage-image-swift-context.xml | 2 +-
plugins/storage/object/ceph/pom.xml | 52 -
.../driver/CephObjectStoreDriverImpl.java | 359 ---
.../lifecycle/CephObjectStoreLifeCycleImpl.java | 133 -
.../provider/CephObjectStoreProviderImpl.java | 85 -
.../storage-object-ceph/module.properties | 18 -
.../spring-storage-object-ceph-context.xml | 31 -
.../driver/CephObjectStoreDriverImplTest.java | 112 -
.../provider/CephObjectStoreProviderImplTest.java | 50 -
plugins/storage/object/minio/pom.xml | 2 +-
.../driver/MinIOObjectStoreDriverImpl.java | 55 +-
.../lifecycle/MinIOObjectStoreLifeCycleImpl.java | 9 +-
.../driver/MinIOObjectStoreDriverImplTest.java | 14 +-
.../provider/MinIOObjectStoreProviderImplTest.java | 10 +-
plugins/storage/object/simulator/pom.xml | 2 +-
.../driver/SimulatorObjectStoreDriverImpl.java | 25 +-
.../SimulatorObjectStoreLifeCycleImpl.java | 3 +
.../SimulatorObjectStoreProviderImplTest.java | 10 +-
plugins/storage/sharedfs/storagevm/pom.xml | 30 -
.../lifecycle/StorageVmSharedFSLifeCycle.java | 303 ---
.../provider/StorageVmSharedFSProvider.java | 79 -
.../sharedfs-provider-storagevm/module.properties | 18 -
.../spring-sharedfs-provider-storagevm-context.xml | 35 -
.../src/main/resources/conf/fsvm-init.yml | 220 --
.../lifecycle/StorageVmSharedFSLifeCycleTest.java | 335 ---
plugins/storage/volume/adaptive/pom.xml | 2 +-
.../driver/AdaptiveDataStoreDriverImpl.java | 82 +-
.../lifecycle/AdaptiveDataStoreLifeCycleImpl.java | 56 +-
.../AdaptivePrimaryDatastoreAdapterFactoryMap.java | 5 +-
.../AdaptivePrimaryDatastoreProviderImpl.java | 9 +-
.../provider/AdaptivePrimaryHostListener.java | 54 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
.../driver/ElastistorPrimaryDataStoreDriver.java | 22 +-
.../ElastistorPrimaryDataStoreLifeCycle.java | 66 +-
.../datastore/provider/ElastistorHostListener.java | 15 +-
.../ElastistorPrimaryDataStoreProvider.java | 9 +-
.../storage/datastore/util/ElastistorUtil.java | 65 +-
.../util/ElastistorVolumeApiServiceImpl.java | 10 +-
.../datastore/util/ListElastistorInterfaceCmd.java | 2 +
.../datastore/util/ListElastistorPoolCmd.java | 2 +
.../datastore/util/ListElastistorVolumeCmd.java | 2 +
plugins/storage/volume/datera/pom.xml | 20 +-
.../driver/DateraPrimaryDataStoreDriver.java | 150 +-
.../lifecycle/DateraPrimaryDataStoreLifeCycle.java | 25 +-
.../datastore/provider/DateraHostListener.java | 27 +-
.../storage/datastore/util/DateraUtil.java | 9 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 47 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 214 +-
.../spring-storage-volume-default-context.xml | 2 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 81 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
.../adapter/flasharray/FlashArrayAdapter.java | 5 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
.../LinstorBackupSnapshotCommandWrapper.java | 21 +-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 7 +-
.../kvm/storage/LinstorStorageAdaptor.java | 110 +-
.../hypervisor/kvm/storage/LinstorStoragePool.java | 33 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 124 +-
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 31 +-
.../datastore/provider/LinstorHostListener.java | 4 +-
.../storage/datastore/util/LinstorUtil.java | 21 +-
.../snapshot/LinstorVMSnapshotStrategy.java | 23 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
.../driver/NexentaPrimaryDataStoreDriver.java | 5 +-
.../NexentaPrimaryDataStoreLifeCycle.java | 5 +-
.../datastore/provider/NexentaHostListener.java | 15 +-
.../storage/datastore/util/NexentaNmsClient.java | 5 +-
.../datastore/util/NexentaStorAppliance.java | 6 +-
.../datastore/util/NexentaStorApplianceTest.java | 2 +-
plugins/storage/volume/primera/pom.xml | 2 +-
.../datastore/adapter/primera/PrimeraAdapter.java | 5 +-
plugins/storage/volume/sample/pom.xml | 2 +-
.../driver/SamplePrimaryDataStoreDriverImpl.java | 7 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../client/ScaleIOGatewayClientConnectionPool.java | 39 +-
.../datastore/client/ScaleIOGatewayClientImpl.java | 91 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 245 +-
.../ScaleIOPrimaryDataStoreLifeCycle.java | 86 +-
.../datastore/manager/ScaleIOSDCManagerImpl.java | 138 +-
.../datastore/provider/ScaleIOHostListener.java | 43 +-
.../provider/ScaleIOPrimaryDatastoreProvider.java | 5 +-
.../storage/datastore/util/ScaleIOUtil.java | 5 +-
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 61 +-
.../ScaleIOPrimaryDataStoreLifeCycleTest.java | 48 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 33 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 20 +-
.../SolidFireSharedPrimaryDataStoreLifeCycle.java | 52 +-
.../datastore/provider/SolidFireHostListener.java | 47 +-
.../provider/SolidFireSharedHostListener.java | 31 +-
.../storage/datastore/util/SolidFireUtil.java | 11 +-
.../apache/cloudstack/storage/test/VolumeTest.java | 4 +-
.../solidfire/src/test/resource/storageContext.xml | 8 +-
plugins/storage/volume/storpool/README.md | 42 +-
plugins/storage/volume/storpool/pom.xml | 45 +-
.../StorPoolBackupSnapshotCommandWrapper.java | 9 +-
...olBackupTemplateFromSnapshotCommandWrapper.java | 6 +-
...torPoolCopyVolumeToSecondaryCommandWrapper.java | 6 +-
.../StorPoolDownloadTemplateCommandWrapper.java | 6 +-
.../StorPoolDownloadVolumeCommandWrapper.java | 6 +-
.../StorPoolModifyStorageCommandWrapper.java | 12 +-
.../StorPoolResizeVolumeCommandWrapper.java | 10 +-
.../StorPoolSetVolumeEncryptionCommandWrapper.java | 2 +
.../kvm/storage/StorPoolStorageAdaptor.java | 37 +-
.../kvm/storage/StorPoolStoragePool.java | 13 +-
.../collector/StorPoolAbandonObjectsCollector.java | 34 +-
.../storage/datastore/api/StorPoolVolumeDef.java | 109 -
.../driver/StorPoolPrimaryDataStoreDriver.java | 417 +--
.../datastore/driver/StorPoolStatsCollector.java | 21 +-
.../StorPoolPrimaryDataStoreLifeCycle.java | 29 +-
.../datastore/provider/StorPoolHostListener.java | 27 +-
.../storage/datastore/util/StorPoolHelper.java | 72 +-
.../storage/datastore/util/StorPoolUtil.java | 67 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 52 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 91 +-
.../snapshot/StorPoolVMSnapshotStrategy.java | 43 +-
.../spring-storage-volume-storpool-context.xml | 18 +-
plugins/user-authenticators/ldap/pom.xml | 43 +-
.../cloudstack/api/command/LDAPConfigCmd.java | 2 +
.../cloudstack/api/command/LDAPRemoveCmd.java | 2 +
.../api/command/LdapAddConfigurationCmd.java | 2 +
.../api/command/LdapCreateAccountCmd.java | 2 +
.../api/command/LdapDeleteConfigurationCmd.java | 2 +
.../cloudstack/api/command/LdapImportUsersCmd.java | 12 +-
.../api/command/LdapListConfigurationCmd.java | 2 +
.../cloudstack/api/command/LdapListUsersCmd.java | 46 +-
.../cloudstack/api/command/LdapUserSearchCmd.java | 4 +-
.../api/command/LinkAccountToLdapCmd.java | 12 +-
.../api/command/LinkDomainToLdapCmd.java | 12 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 4 +-
.../apache/cloudstack/ldap/LdapAuthenticator.java | 40 +-
.../apache/cloudstack/ldap/LdapContextFactory.java | 9 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 46 +-
.../cloudstack/ldap/LdapUserManagerFactory.java | 5 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 21 +-
.../api/command/LdapImportUsersCmdTest.java | 6 +-
.../api/command/LdapListUsersCmdTest.java | 2 +-
.../api/command/LinkAccountToLdapCmdTest.java | 12 +-
.../api/command/LinkDomainToLdapCmdTest.java | 12 +-
.../cloudstack/ldap/ADLdapUserManagerImplTest.java | 2 +-
.../cloudstack/ldap/LdapAuthenticatorTest.java | 2 +-
.../cloudstack/ldap/LdapConfigurationTest.java | 2 +-
.../ldap/LdapDirectoryServerConnectionTest.java | 4 +-
.../apache/cloudstack/ldap/LdapTestConfigTool.java | 7 +
.../ldap/LdapUnboundidZapdotConnectionTest.java | 2 +-
.../cloudstack/ldap/LdapUnitConnectionTest.java | 2 +-
.../ldap/LdapUserManagerFactoryTest.java | 2 +-
.../ldap/src/test/resources/log4j.xml | 100 +-
.../org.mockito.plugins.MockMaker | 1 +
plugins/user-authenticators/md5/pom.xml | 2 +-
.../cloudstack/auth/MD5UserAuthenticator.java | 12 +-
.../META-INF/cloudstack/md5/spring-md5-context.xml | 2 +-
.../cloudstack/auth/MD5UserAuthenticatorTest.java | 2 +-
plugins/user-authenticators/oauth2/pom.xml | 2 +-
.../cloudstack/oauth2/OAuth2AuthManagerImpl.java | 6 +-
.../cloudstack/oauth2/OAuth2UserAuthenticator.java | 12 +-
.../oauth2/api/command/DeleteOAuthProviderCmd.java | 2 +
.../oauth2/api/command/ListOAuthProvidersCmd.java | 4 +-
.../api/command/OauthLoginAPIAuthenticatorCmd.java | 9 +-
.../oauth2/api/command/UpdateOAuthProviderCmd.java | 2 +
.../api/command/VerifyOAuthCodeAndGetUserCmd.java | 4 +-
.../oauth2/google/GoogleOAuth2Provider.java | 2 +
.../oauth2/OAuth2UserAuthenticatorTest.java | 2 +-
.../api/command/DeleteOAuthProviderCmdTest.java | 12 +-
.../command/OauthLoginAPIAuthenticatorCmdTest.java | 11 +-
.../api/command/RegisterOAuthProviderCmdTest.java | 12 +-
.../oauth2/google/GoogleOAuth2ProviderTest.java | 10 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
.../server/auth/PBKDF2UserAuthenticator.java | 14 +-
.../server/auth/PBKD2UserAuthenticatorTest.java | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
.../auth/PlainTextUserAuthenticator.java | 12 +-
.../plaintext/spring-plaintext-context.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../api/command/AuthorizeSAMLSSOCmd.java | 2 +
.../api/command/GetServiceProviderMetaDataCmd.java | 8 +-
.../api/command/ListAndSwitchSAMLAccountCmd.java | 32 +-
.../apache/cloudstack/api/command/ListIdpsCmd.java | 4 +-
.../api/command/ListSamlAuthorizationCmd.java | 2 +
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 30 +-
.../command/SAML2LogoutAPIAuthenticatorCmd.java | 16 +-
.../cloudstack/saml/SAML2AuthManagerImpl.java | 46 +-
.../cloudstack/saml/SAML2UserAuthenticator.java | 10 +-
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 19 +-
.../GetServiceProviderMetaDataCmdTest.java | 2 +-
.../cloudstack/SAML2AuthManagerImplTest.java | 2 +-
.../command/ListAndSwitchSAMLAccountCmdTest.java | 2 +-
.../SAML2LogoutAPIAuthenticatorCmdTest.java | 2 +-
.../cloudstack/saml/SAML2AuthManagerImplTest.java | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../auth/SHA256SaltedUserAuthenticator.java | 12 +-
.../sha256salted/spring-sha256salted-context.xml | 2 +-
.../cloudstack/auth/test/AuthenticatorTest.java | 2 +-
.../static-pin/pom.xml | 2 +-
.../auth/StaticPinUserTwoFactorAuthenticator.java | 4 +-
.../staticpin/spring-staticpin-context.xml | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
.../auth/TotpUserTwoFactorAuthenticator.java | 4 +-
.../cloudstack/totp/spring-google-context.xml | 2 +-
pom.xml | 77 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 4 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 4 +-
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 4 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 4 +-
.../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 4 +-
.../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 6 +-
python/lib/cloud_utils.py | 6 +-
python/lib/cloudutils/configFileOps.py | 2 +-
python/lib/cloudutils/syscfg.py | 11 +-
python/lib/cloudutils/utilities.py | 8 +-
quickcloud/pom.xml | 2 +-
.../spring-quickcloud-core-context-override.xml | 2 +-
scripts/installer/cloudstack-help-text | 6 -
scripts/installer/createtmplt.sh | 28 +-
scripts/installer/createvolume.sh | 26 +-
scripts/installer/installcentos.sh | 10 +-
scripts/installer/installdomp.sh | 6 +-
scripts/installer/run_installer.sh | 6 +-
scripts/network/domr/router_proxy.sh | 6 +-
scripts/network/exdhcp/dnsmasq_edithosts.sh | 16 +-
scripts/network/exdhcp/prepare_dhcpd.sh | 4 +-
scripts/network/exdhcp/prepare_dnsmasq.sh | 8 +-
scripts/network/juniper/application-add.xml | 8 +-
scripts/network/juniper/application-getone.xml | 6 +-
scripts/network/juniper/dest-nat-rule-add.xml | 6 +-
.../network/juniper/guest-vlan-filter-term-add.xml | 22 +-
scripts/network/juniper/private-interface-add.xml | 30 +-
.../network/juniper/private-interface-getone.xml | 14 +-
.../juniper/private-interface-with-filters-add.xml | 32 +-
scripts/network/juniper/proxy-arp-add.xml | 22 +-
scripts/network/juniper/proxy-arp-getall.xml | 12 +-
scripts/network/juniper/proxy-arp-getone.xml | 22 +-
.../network/juniper/public-ip-filter-term-add.xml | 32 +-
scripts/network/juniper/security-policy-group.xml | 14 +-
scripts/network/juniper/zone-interface-add.xml | 18 +-
scripts/network/juniper/zone-interface-getone.xml | 18 +-
scripts/network/ping/baremetal_user_data.py | 2 +-
scripts/storage/checkchildren.sh | 4 +-
scripts/storage/installIso.sh | 14 +-
scripts/storage/qcow2/create_private_template.sh | 8 +-
scripts/storage/qcow2/createtmplt.sh | 20 +-
scripts/storage/qcow2/createvm.sh | 58 +-
scripts/storage/qcow2/createvolume.sh | 20 +-
scripts/storage/qcow2/delvm.sh | 14 +-
scripts/storage/qcow2/get_domr_kernel.sh | 12 +-
scripts/storage/qcow2/get_iqn.sh | 4 +-
scripts/storage/qcow2/importmpl.sh | 20 +-
scripts/storage/qcow2/listvmdisk.sh | 16 +-
scripts/storage/qcow2/listvmdisksize.sh | 12 +-
scripts/storage/qcow2/listvmtmplt.sh | 10 +-
scripts/storage/qcow2/listvolume.sh | 10 +-
scripts/storage/qcow2/managevolume.sh | 44 +-
.../create_privatetemplate_from_snapshot_xen.sh | 10 +-
scripts/storage/secondary/createtmplt.sh | 18 +-
scripts/storage/secondary/createvolume.sh | 20 +-
scripts/storage/secondary/installIso.sh | 14 +-
scripts/storage/secondary/listvmtmplt.sh | 8 +-
scripts/storage/secondary/listvolume.sh | 8 +-
scripts/storage/secondary/swift | 2 +-
scripts/util/prepare_linmin.sh | 4 +-
scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 22 +-
scripts/vm/hypervisor/kvm/nasbackup.sh | 233 --
scripts/vm/hypervisor/kvm/setup_agent.sh | 38 +-
scripts/vm/hypervisor/xenserver/check_heartbeat.sh | 10 +-
.../vm/hypervisor/xenserver/cloud-clean-vlan.sh | 4 +-
.../hypervisor/xenserver/cloud-prepare-upgrade.sh | 6 +-
.../hypervisor/xenserver/cloud-propagate-vlan.sh | 4 +-
.../vm/hypervisor/xenserver/cloud-setup-bonding.sh | 12 +-
.../xenserver/copy_vhd_from_secondarystorage.sh | 12 +-
.../xenserver/copy_vhd_to_secondarystorage.sh | 12 +-
.../create_privatetemplate_from_snapshot.sh | 14 +-
.../vm/hypervisor/xenserver/kill_copy_process.sh | 10 +-
scripts/vm/hypervisor/xenserver/launch_hb.sh | 6 +-
scripts/vm/hypervisor/xenserver/make_migratable.sh | 6 +-
scripts/vm/hypervisor/xenserver/network_info.sh | 4 +-
scripts/vm/hypervisor/xenserver/ovs-get-bridge.sh | 4 +-
.../vm/hypervisor/xenserver/ovs-get-dhcp-iface.sh | 4 +-
scripts/vm/hypervisor/xenserver/perfmon.py | 2 +-
.../hypervisor/xenserver/setup_heartbeat_file.sh | 14 +-
scripts/vm/hypervisor/xenserver/setup_iscsi.sh | 6 +-
scripts/vm/hypervisor/xenserver/setupxenserver.sh | 6 +-
scripts/vm/hypervisor/xenserver/swift | 2 +-
.../vm/hypervisor/xenserver/upgrade_snapshot.sh | 14 +-
.../vm/hypervisor/xenserver/upgrade_vnc_config.sh | 4 +-
scripts/vm/hypervisor/xenserver/xs_cleanup.sh | 8 +-
scripts/vm/network/ovs-pvlan-cleanup.sh | 4 +-
scripts/vm/network/ovs-pvlan-dhcp-host.sh | 4 +-
scripts/vm/network/ovs-pvlan-kvm-dhcp-host.sh | 4 +-
scripts/vm/network/ovs-pvlan-vm.sh | 4 +-
scripts/vm/network/security_group.py | 6 +-
scripts/vm/network/vnet/modifyvlan.sh | 30 +-
scripts/vm/network/vnet/ovstunnel.py | 2 +-
scripts/vm/pingtest.sh | 6 +-
scripts/vm/systemvm/injectkeys.sh | 4 +-
server/conf/cloudstack-management.logrotate.in | 28 -
server/conf/log4j-cloud.xml.in | 242 +-
server/pom.xml | 14 +-
.../com/cloud/acl/AffinityGroupAccessChecker.java | 4 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 28 +-
.../manager/allocator/impl/FirstFitAllocator.java | 147 +-
.../allocator/impl/FirstFitRoutingAllocator.java | 8 +-
.../allocator/impl/RecreateHostAllocator.java | 14 +-
.../allocator/impl/UserConcentratedAllocator.java | 45 +-
.../manager/authn/impl/BasicAgentAuthManager.java | 4 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 281 +-
.../java/com/cloud/alert/ClusterAlertAdapter.java | 32 +-
.../com/cloud/alert/ConsoleProxyAlertAdapter.java | 42 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 42 +-
.../java/com/cloud/api/ApiAsyncJobDispatcher.java | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 78 +-
.../src/main/java/com/cloud/api/ApiDispatcher.java | 7 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 313 +--
.../java/com/cloud/api/ApiSerializerHelper.java | 9 +-
server/src/main/java/com/cloud/api/ApiServer.java | 357 +--
server/src/main/java/com/cloud/api/ApiServlet.java | 14 +-
.../java/com/cloud/api/ApiSessionListener.java | 23 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 9 +-
.../com/cloud/api/ResponseObjectTypeAdapter.java | 17 +-
.../api/auth/APIAuthenticationManagerImpl.java | 14 +-
.../DefaultForgotPasswordAPIAuthenticatorCmd.java | 165 --
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 8 +-
.../api/auth/DefaultLogoutAPIAuthenticatorCmd.java | 2 +
.../DefaultResetPasswordAPIAuthenticatorCmd.java | 193 --
.../auth/SetupUserTwoFactorAuthenticationCmd.java | 2 +
...ValidateUserTwoFactorAuthenticationCodeCmd.java | 6 +-
.../api/dispatch/ParamGenericValidationWorker.java | 7 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 87 +-
.../com/cloud/api/dispatch/ParamUnpackWorker.java | 7 +-
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 13 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 511 ++--
.../com/cloud/api/query/ViewResponseHelper.java | 21 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 5 +-
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 63 +-
.../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 2 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 29 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 2 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 9 +-
...anagementServerJoinDao.java => HostTagDao.java} | 11 +-
.../com/cloud/api/query/dao/HostTagDaoImpl.java | 124 +
.../cloud/api/query/dao/ImageStoreJoinDaoImpl.java | 2 +
.../api/query/dao/InstanceGroupJoinDaoImpl.java | 2 +
.../api/query/dao/NetworkOfferingJoinDaoImpl.java | 15 +-
.../api/query/dao/ProjectAccountJoinDaoImpl.java | 2 +
.../query/dao/ProjectInvitationJoinDaoImpl.java | 2 +
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 2 +
.../api/query/dao/ResourceTagJoinDaoImpl.java | 2 +
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 4 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 19 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 14 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 50 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 15 +-
.../cloud/api/query/dao/UserAccountJoinDao.java | 3 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 8 +-
.../com/cloud/api/query/dao/UserVmJoinDao.java | 5 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 38 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 8 +-
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 12 +-
.../java/com/cloud/api/query/vo/AccountJoinVO.java | 7 -
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 4 +-
.../java/com/cloud/api/query/vo/HostJoinVO.java | 28 +-
.../java/com/cloud/api/query/vo/HostTagVO.java | 51 +-
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 55 -
.../com/cloud/api/query/vo/SnapshotJoinVO.java | 4 +-
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 21 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 14 +-
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 7 -
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 21 +-
.../java/com/cloud/api/query/vo/VolumeJoinVO.java | 11 +-
.../com/cloud/api/query/vo/VpcOfferingJoinVO.java | 42 -
.../cloud/api/response/ApiResponseSerializer.java | 13 +-
.../main/java/com/cloud/bgp/BGPServiceImpl.java | 459 ----
.../com/cloud/capacity/CapacityManagerImpl.java | 440 ++--
.../main/java/com/cloud/configuration/Config.java | 41 +-
.../configuration/ConfigurationManagerImpl.java | 941 +++----
.../AgentBasedConsoleProxyManager.java | 32 +-
.../AgentBasedStandaloneConsoleProxyManager.java | 30 +-
.../java/com/cloud/consoleproxy/AgentHookBase.java | 68 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 285 +-
.../cloud/consoleproxy/ConsoleProxyService.java | 3 +-
.../consoleproxy/StaticConsoleProxyManager.java | 2 +-
.../java/com/cloud/dc/DedicatedResourceVO.java | 8 -
.../com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 9 +-
.../deploy/DeploymentPlanningManagerImpl.java | 1026 ++++----
.../java/com/cloud/deploy/FirstFitPlanner.java | 110 +-
.../java/com/cloud/event/ActionEventUtils.java | 74 +-
.../main/java/com/cloud/event/AlertGenerator.java | 23 +-
.../java/com/cloud/event/dao/EventJoinDaoImpl.java | 6 +-
.../com/cloud/ha/AbstractInvestigatorImpl.java | 39 +-
.../com/cloud/ha/CheckOnAgentInvestigator.java | 10 +-
server/src/main/java/com/cloud/ha/HaWorkVO.java | 15 +-
.../cloud/ha/HighAvailabilityManagerExtImpl.java | 10 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 421 +--
server/src/main/java/com/cloud/ha/KVMFencer.java | 10 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 36 +-
.../main/java/com/cloud/ha/RecreatableFencer.java | 14 +-
.../java/com/cloud/ha/UserVmDomRInvestigator.java | 67 +-
.../java/com/cloud/ha/XenServerInvestigator.java | 4 +-
.../java/com/cloud/ha/dao/HighAvailabilityDao.java | 3 -
.../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 46 +-
.../hypervisor/CloudZonesStartupProcessor.java | 10 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 63 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 2 +
.../main/java/com/cloud/hypervisor/KVMGuru.java | 40 +-
.../kvm/discoverer/KvmServerDiscoverer.java | 2 +
.../kvm/discoverer/LibvirtServerDiscoverer.java | 114 +-
.../kvm/discoverer/LxcServerDiscoverer.java | 2 +
.../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java | 12 +-
.../metadata/ResourceMetaDataManagerImpl.java | 2 +
.../network/ExternalDeviceUsageManagerImpl.java | 80 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 53 +-
.../cloud/network/ExternalIpAddressAllocator.java | 10 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 104 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 264 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 19 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 58 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 51 +-
.../java/com/cloud/network/NetworkModelImpl.java | 282 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 631 ++---
.../com/cloud/network/NetworkUsageManagerImpl.java | 60 +-
.../com/cloud/network/PortProfileManagerImpl.java | 11 +-
.../com/cloud/network/SshKeysDistriMonitor.java | 18 +-
.../cloud/network/StorageNetworkManagerImpl.java | 8 +-
.../com/cloud/network/as/AutoScaleManager.java | 5 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 359 ++-
.../network/element/ConfigDriveNetworkElement.java | 153 +-
.../network/element/VirtualRouterElement.java | 106 +-
.../network/element/VpcVirtualRouterElement.java | 128 +-
.../network/firewall/FirewallManagerImpl.java | 161 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 31 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 31 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 14 +-
.../network/guru/ExternalGuestNetworkGuru.java | 32 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 37 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 15 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 15 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 19 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 10 +-
.../cloud/network/lb/LBHealthCheckManagerImpl.java | 16 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 280 +-
.../cloud/network/router/CommandSetupHelper.java | 111 +-
.../cloud/network/router/NetworkHelperImpl.java | 117 +-
.../cloud/network/router/NicProfileHelperImpl.java | 10 +-
.../cloud/network/router/RouterControlHelper.java | 5 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 459 ++--
.../cloud/network/router/VpcNetworkHelperImpl.java | 13 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 138 +-
.../com/cloud/network/rules/AdvancedVpnRules.java | 4 +-
.../com/cloud/network/rules/BgpPeersRules.java | 48 -
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../com/cloud/network/rules/NicPlugInOutRules.java | 22 +-
.../cloud/network/rules/PrivateGatewayRules.java | 24 +-
.../java/com/cloud/network/rules/RuleApplier.java | 4 -
.../com/cloud/network/rules/RulesManagerImpl.java | 181 +-
.../cloud/network/rules/VpcIpAssociationRules.java | 8 +-
.../security/LocalSecurityGroupWorkQueue.java | 5 +-
.../network/security/SecurityGroupListener.java | 32 +-
.../network/security/SecurityGroupManagerImpl.java | 192 +-
.../security/SecurityGroupManagerImpl2.java | 57 +-
.../network/security/SecurityGroupWorkTracker.java | 7 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 61 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 139 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 674 ++---
.../vpc/VpcPrivateGatewayTransactionCallable.java | 14 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 49 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 34 +-
.../java/com/cloud/projects/ProjectManager.java | 11 +-
.../com/cloud/projects/ProjectManagerImpl.java | 126 +-
.../java/com/cloud/resource/DiscovererBase.java | 20 +-
.../com/cloud/resource/DummyHostDiscoverer.java | 4 +-
.../com/cloud/resource/ResourceManagerImpl.java | 491 ++--
.../resource/RollingMaintenanceManagerImpl.java | 42 +-
.../resourceicon/ResourceIconManagerImpl.java | 11 +-
.../cloud/resourcelimit/CheckedReservation.java | 155 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 1503 ++---------
.../com/cloud/server/ConfigurationServerImpl.java | 196 +-
.../server/ManagementServerHostStatsEntry.java | 10 -
.../com/cloud/server/ManagementServerImpl.java | 600 ++---
.../main/java/com/cloud/server/StatsCollector.java | 381 ++-
.../com/cloud/servlet/CloudStartupServlet.java | 2 +
.../com/cloud/servlet/ConsoleProxyClientParam.java | 17 -
.../ConsoleProxyPasswordBasedEncryptor.java | 5 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 89 +-
.../com/cloud/storage/ImageStoreServiceImpl.java | 12 +-
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 78 +-
.../java/com/cloud/storage/OCFS2ManagerImpl.java | 26 +-
.../com/cloud/storage/ResizeVolumePayload.java | 8 -
.../java/com/cloud/storage/StorageManagerImpl.java | 816 +++---
.../cloud/storage/StoragePoolAutomationImpl.java | 38 +-
.../java/com/cloud/storage/TemplateProfile.java | 18 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 583 ++--
.../storage/download/DownloadActiveState.java | 10 +-
.../cloud/storage/download/DownloadErrorState.java | 2 +-
.../cloud/storage/download/DownloadListener.java | 58 +-
.../storage/download/DownloadMonitorImpl.java | 28 +-
.../com/cloud/storage/download/DownloadState.java | 11 +-
.../storage/listener/SnapshotStateListener.java | 29 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 36 +-
.../storage/listener/StorageSyncListener.java | 11 +-
.../storage/listener/VolumeStateListener.java | 44 +-
.../resource/DummySecondaryStorageResource.java | 2 +
.../secondary/SecondaryStorageListener.java | 9 +-
.../cloud/storage/snapshot/SnapshotManager.java | 3 +-
.../storage/snapshot/SnapshotManagerImpl.java | 246 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 150 +-
.../cloud/storage/upload/UploadActiveState.java | 8 +-
.../com/cloud/storage/upload/UploadErrorState.java | 3 +-
.../com/cloud/storage/upload/UploadListener.java | 19 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 38 +-
.../java/com/cloud/storage/upload/UploadState.java | 11 +-
.../upload/params/TemplateUploadParams.java | 5 +-
.../cloud/storage/upload/params/UploadParams.java | 2 -
.../storage/upload/params/UploadParamsBase.java | 14 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 29 +-
.../cloud/template/HypervisorTemplateAdapter.java | 65 +-
.../java/com/cloud/template/TemplateAdapter.java | 5 +-
.../com/cloud/template/TemplateAdapterBase.java | 57 +-
.../com/cloud/template/TemplateManagerImpl.java | 193 +-
.../main/java/com/cloud/test/DatabaseConfig.java | 63 +-
.../src/main/java/com/cloud/test/TestAppender.java | 181 ++
.../java/com/cloud/usage/UsageServiceImpl.java | 66 +-
.../main/java/com/cloud/user/AccountManager.java | 8 +-
.../java/com/cloud/user/AccountManagerImpl.java | 606 ++---
.../java/com/cloud/user/DomainManagerImpl.java | 130 +-
.../java/com/cloud/user/PasswordPolicyImpl.java | 5 +-
.../java/com/cloud/vm/SystemVmLoadScanner.java | 13 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 47 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2771 ++++++++------------
.../java/com/cloud/vm/UserVmStateListener.java | 32 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 78 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 12 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 162 +-
.../affinity/AffinityGroupServiceImpl.java | 22 +-
.../agent/lb/IndirectAgentLBServiceImpl.java | 158 +-
.../IndirectAgentLBRoundRobinAlgorithm.java | 5 -
.../annotation/AnnotationManagerImpl.java | 34 +-
.../cloudstack/backup/BackupManagerImpl.java | 212 +-
.../backup/BackupRepositoryServiceImpl.java | 114 -
.../org/apache/cloudstack/ca/CAManagerImpl.java | 28 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 35 +-
.../consoleproxy/ConsoleAccessManagerImpl.java | 104 +-
.../cloudstack/diagnostics/DiagnosticsHelper.java | 7 +-
.../diagnostics/DiagnosticsServiceImpl.java | 32 +-
.../diagnostics/to/DiagnosticsDataObject.java | 8 -
.../direct/download/DirectDownloadManagerImpl.java | 125 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 37 +-
.../ha/provider/host/HAAbstractHostProvider.java | 16 +-
.../cloudstack/ha/task/ActivityCheckTask.java | 2 +
.../org/apache/cloudstack/ha/task/BaseHATask.java | 9 +-
.../apache/cloudstack/ha/task/HealthCheckTask.java | 2 +
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 1658 ------------
.../lb/ApplicationLoadBalancerManagerImpl.java | 13 +-
.../deployment/RouterDeploymentDefinition.java | 38 +-
.../RouterDeploymentDefinitionBuilder.java | 4 -
.../deployment/VpcRouterDeploymentDefinition.java | 33 +-
.../cloudstack/network/ssl/CertServiceImpl.java | 9 +-
.../network/topology/AdvancedNetworkTopology.java | 61 +-
.../network/topology/AdvancedNetworkVisitor.java | 32 +-
.../network/topology/BasicNetworkTopology.java | 69 +-
.../network/topology/BasicNetworkVisitor.java | 10 +-
.../network/topology/NetworkTopology.java | 3 -
.../network/topology/NetworkTopologyVisitor.java | 6 -
.../OutOfBandManagementServiceImpl.java | 54 +-
.../outofbandmanagement/PowerOperationTask.java | 10 +-
.../cloudstack/poll/BackgroundPollManagerImpl.java | 6 +-
.../cloudstack/region/RegionManagerImpl.java | 2 +
.../cloudstack/region/RegionServiceImpl.java | 2 +
.../apache/cloudstack/region/RegionsApiUtil.java | 39 +-
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 34 +-
.../resource/ResourceCleanupServiceImpl.java | 829 ------
.../apache/cloudstack/snapshot/SnapshotHelper.java | 30 +-
.../cloudstack/storage/NfsMountManagerImpl.java | 33 +-
.../storage/browser/StorageBrowserImpl.java | 14 +-
.../storage/heuristics/HeuristicRuleHelper.java | 15 +-
.../storage/heuristics/presetvariables/Domain.java | 2 +-
.../GenericHeuristicPresetVariable.java | 6 +-
.../storage/object/BucketApiServiceImpl.java | 44 +-
.../storage/sharedfs/SharedFSServiceImpl.java | 720 -----
.../sharedfs/query/dao/SharedFSJoinDao.java | 38 -
.../sharedfs/query/dao/SharedFSJoinDaoImpl.java | 187 --
.../storage/sharedfs/query/vo/SharedFSJoinVO.java | 320 ---
.../storage/template/VnfTemplateManagerImpl.java | 25 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 47 +-
.../cloudstack/user/UserPasswordResetManager.java | 71 -
.../user/UserPasswordResetManagerImpl.java | 299 ---
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 350 +--
.../vm/schedule/VMScheduleManagerImpl.java | 9 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 50 +-
.../apache/cloudstack/webhook/WebhookHelper.java | 28 -
.../core/spring-server-core-managers-context.xml | 22 +-
.../core/spring-server-core-misc-context.xml | 4 +-
...spring-server-alert-adapter-backend-context.xml | 2 +-
...spring-server-alert-adapter-compute-context.xml | 2 +-
...spring-server-alert-adapter-storage-context.xml | 2 +-
.../spring-server-allocator-context.xml | 2 +-
.../server-fencer/spring-server-fencer-context.xml | 4 +-
.../spring-server-investigator-context.xml | 2 +-
.../spring-server-template-adapter-context.xml | 2 +-
.../com/cloud/upgrade/databaseCreatorContext.xml | 6 +-
.../com/cloud/alert/AlertControlsUnitTest.java | 23 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 157 +-
.../java/com/cloud/api/ApiResponseHelperTest.java | 29 -
.../src/test/java/com/cloud/api/ApiServerTest.java | 121 +-
.../dispatch/ParamGenericValidationWorkerTest.java | 40 +-
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 42 +-
.../query/MutualExclusiveIdsManagerBaseTest.java | 2 +-
.../com/cloud/api/query/QueryManagerImplTest.java | 147 --
.../GenericDaoBaseWithTagInformationBaseTest.java | 6 +-
.../query/dao/SecurityGroupJoinDaoImplTest.java | 11 +-
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 6 +-
.../java/com/cloud/bgp/BGPServiceImplTest.java | 176 --
.../cloud/capacity/CapacityManagerImplTest.java | 182 --
.../com/cloud/capacity/CapacityManagerTest.java | 10 +-
.../ConfigurationManagerImplTest.java | 439 +---
.../configuration/ConfigurationManagerTest.java | 265 +-
.../cloud/configuration/ValidateIpRangeTest.java | 9 +-
.../consoleproxy/ConsoleProxyManagerTest.java | 33 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 55 +-
.../cloud/event/ActionEventInterceptorTest.java | 4 +-
.../java/com/cloud/event/ActionEventUtilsTest.java | 20 +-
.../com/cloud/event/EventControlsUnitTest.java | 21 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 234 +-
.../src/test/java/com/cloud/ha/KVMFencerTest.java | 10 +-
.../cloud/ha/dao/HighAvailabilityDaoImplTest.java | 125 -
.../java/com/cloud/hypervisor/KVMGuruTest.java | 2 +-
.../hypervisor/kvm/dpdk/DpdkHelperImplTest.java | 2 +-
.../test/java/com/cloud/keystore/KeystoreTest.java | 2 +
.../metadata/ResourceMetaDataManagerTest.java | 15 +-
.../cloud/network/CreatePrivateNetworkTest.java | 31 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 20 +-
.../ExternalLoadBalancerDeviceManagerImplTest.java | 2 +-
.../com/cloud/network/IpAddressManagerTest.java | 4 +-
.../com/cloud/network/Ipv6AddressManagerTest.java | 10 +-
.../com/cloud/network/Ipv6ServiceImplTest.java | 104 +-
.../com/cloud/network/MockFirewallManagerImpl.java | 4 +-
.../com/cloud/network/MockNetworkModelImpl.java | 15 -
.../com/cloud/network/NetworkModelImplTest.java | 64 +-
.../java/com/cloud/network/NetworkModelTest.java | 17 +-
.../com/cloud/network/NetworkServiceImplTest.java | 171 +-
.../cloud/network/UpdatePhysicalNetworkTest.java | 4 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 209 +-
.../element/ConfigDriveNetworkElementTest.java | 29 +-
.../network/element/VirtualRouterElementTest.java | 70 +-
.../element/VpcVirtualRouterElementTest.java | 8 +-
.../network/firewall/FirewallManagerTest.java | 46 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 14 +-
.../network/guru/ExternalGuestNetworkGuruTest.java | 2 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 6 +-
.../cloud/network/lb/UpdateLoadBalancerTest.java | 6 +-
.../network/router/CommandSetupHelperTest.java | 192 --
.../network/router/NetworkHelperImplTest.java | 26 +-
.../network/router/RouterControlHelperTest.java | 2 +-
.../VirtualNetworkApplianceManagerImplTest.java | 71 +-
.../com/cloud/network/rules/BgpPeersRulesTest.java | 98 -
.../network/vpc/NetworkACLManagerImplTest.java | 2 +-
.../cloud/network/vpc/NetworkACLManagerTest.java | 8 +-
.../network/vpc/NetworkACLServiceImplTest.java | 169 +-
.../com/cloud/network/vpc/VpcManagerImplTest.java | 81 +-
.../com/cloud/projects/MockProjectManagerImpl.java | 2 +-
.../com/cloud/projects/ProjectManagerImplTest.java | 40 +-
.../cloud/resource/MockResourceManagerImpl.java | 6 +-
.../RollingMaintenanceManagerImplTest.java | 10 +-
.../resourcelimit/CheckedReservationTest.java | 107 +-
.../ResourceLimitManagerImplTest.java | 1155 +-------
.../cloud/server/ConfigurationServerImplTest.java | 2 +-
.../com/cloud/server/ManagementServerImplTest.java | 6 +-
.../java/com/cloud/server/StatsCollectorTest.java | 148 +-
.../com/cloud/storage/StorageManagerImplTest.java | 462 +---
.../cloud/storage/VolumeApiServiceImplTest.java | 152 +-
.../com/cloud/storage/dao/AsyncJobJoinDaoTest.java | 2 +-
.../storage/listener/StoragePoolMonitorTest.java | 8 +-
.../storage/snapshot/SnapshotManagerTest.java | 134 +-
.../snapshot/SnapshotSchedulerImplTest.java | 59 -
.../template/HypervisorTemplateAdapterTest.java | 168 +-
.../cloud/template/TemplateManagerImplTest.java | 6 +-
.../com/cloud/user/AccountManagerImplTest.java | 182 +-
.../AccountManagerImplVolumeDeleteEventTest.java | 25 +-
.../com/cloud/user/AccountManagetImplTestBase.java | 3 -
.../java/com/cloud/user/DomainManagerImplTest.java | 76 +-
.../com/cloud/user/MockAccountManagerImpl.java | 57 +-
.../java/com/cloud/user/MockUsageEventDao.java | 26 +-
.../com/cloud/user/PasswordPolicyImplTest.java | 18 -
.../java/com/cloud/vm/FirstFitPlannerTest.java | 95 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 1946 +-------------
.../test/java/com/cloud/vm/UserVmManagerTest.java | 21 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 35 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 9 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 43 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 16 -
.../cloud/vpc/MockResourceLimitManagerImpl.java | 210 +-
.../java/com/cloud/vpc/NetworkACLServiceTest.java | 16 +-
.../test/java/com/cloud/vpc/Site2SiteVpnTest.java | 10 +-
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 1 -
.../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 6 +-
.../vpc/dao/MockNetworkServiceMapDaoImpl.java | 5 -
.../java/com/cloud/vpc/dao/MockVpcDaoImpl.java | 6 +-
.../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java | 5 -
.../apache/cloudstack/acl/RoleManagerImplTest.java | 170 +-
.../cloudstack/affinity/AffinityApiUnitTest.java | 22 +-
.../affinity/AffinityGroupServiceImplTest.java | 37 +-
.../agent/lb/IndirectAgentLBServiceImplTest.java | 64 +-
.../cloudstack/backup/BackupManagerTest.java | 59 +-
.../apache/cloudstack/ca/CABackgroundTaskTest.java | 2 +-
.../cluster/ClusterDrsServiceImplTest.java | 10 +-
.../DiagnosticsFilesListFactoryTest.java | 2 +-
.../diagnostics/DiagnosticsServiceImplTest.java | 2 +-
.../download/DirectDownloadManagerImplTest.java | 2 +-
.../network/RoutedIpv4ManagerImplTest.java | 1217 ---------
.../network/lb/ApplicationLoadBalancerTest.java | 12 +-
.../deployment/RouterDeploymentDefinitionTest.java | 21 +-
.../VpcRouterDeploymentDefinitionTest.java | 11 +-
.../cloudstack/network/ssl/CertServiceTest.java | 26 +-
.../networkoffering/CreateNetworkOfferingTest.java | 72 +-
.../OutOfBandManagementServiceTest.java | 2 +-
.../cloudstack/privategw/AclOnPrivateGwTest.java | 6 +-
.../cloudstack/region/RegionManagerTest.java | 4 +-
.../GlobalLoadBalancingRulesServiceImplTest.java | 30 +-
.../resource/ResourceCleanupServiceImplTest.java | 656 -----
.../cloudstack/service/ServiceOfferingVOTest.java | 9 +-
.../heuristics/HeuristicRuleHelperTest.java | 21 +-
.../heuristics/presetvariables/AccountTest.java | 46 -
.../heuristics/presetvariables/DomainTest.java | 41 -
.../GenericHeuristicPresetVariableTest.java | 40 -
.../presetvariables/SecondaryStorageTest.java | 45 -
.../heuristics/presetvariables/SnapshotTest.java | 44 -
.../heuristics/presetvariables/TemplateTest.java | 46 -
.../heuristics/presetvariables/VolumeTest.java | 44 -
.../storage/sharedfs/SharedFSServiceImplTest.java | 665 -----
.../query/dao/SharedFSJoinDaoImplTest.java | 152 --
.../VolumeImportUnmanageManagerImplTest.java | 20 +-
.../user/UserPasswordResetManagerImplTest.java | 150 --
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 253 +-
.../vm/schedule/VMScheduleManagerImplTest.java | 10 +-
.../vm/schedule/VMSchedulerImplTest.java | 11 +-
.../test/resources/StoragePoolDaoTestContext.xml | 2 +-
.../src/test/resources/VpcApiUnitTestContext.xml | 22 +-
server/src/test/resources/VpcTestContext.xml | 22 +-
server/src/test/resources/appLoadBalancer.xml | 28 +-
.../src/test/resources/createNetworkOffering.xml | 25 +-
.../org.mockito.plugins.MockMaker | 1 +
server/src/test/resources/testContext.xml | 14 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/README.txt | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
.../java/common/BufferedImagePixelsAdapter.java | 11 +-
.../src/main/java/rdpclient/rdp/ClientInfoPDU.java | 6 +-
.../src/main/java/streamer/BaseElement.java | 4 -
.../src/main/java/streamer/InputStreamSource.java | 6 +-
.../src/main/java/streamer/OutputStreamSink.java | 6 +-
.../src/main/java/streamer/PipelineImpl.java | 4 -
.../src/main/java/streamer/SocketWrapperImpl.java | 10 +-
.../src/main/java/streamer/SyncLink.java | 29 +-
.../src/main/java/streamer/apr/AprSocketSink.java | 4 +-
.../main/java/streamer/apr/AprSocketSource.java | 4 +-
.../java/streamer/apr/AprSocketWrapperImpl.java | 8 +-
.../java/streamer/bco/BcoSocketWrapperImpl.java | 10 +-
.../src/main/java/streamer/debug/FakeSource.java | 4 +-
.../src/main/java/streamer/debug/MockServer.java | 11 +-
.../src/test/java/streamer/BaseElementTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 +
services/console-proxy/server/pom.xml | 10 +-
.../com/cloud/consoleproxy/AjaxFIFOImageCache.java | 21 +-
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 130 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 81 +-
.../consoleproxy/ConsoleProxyAjaxImageHandler.java | 27 +-
.../ConsoleProxyBaseServerFactoryImpl.java | 13 +-
.../cloud/consoleproxy/ConsoleProxyClientBase.java | 23 +-
.../consoleproxy/ConsoleProxyClientParam.java | 16 -
.../cloud/consoleproxy/ConsoleProxyCmdHandler.java | 15 +-
.../cloud/consoleproxy/ConsoleProxyGCThread.java | 19 +-
.../ConsoleProxyHttpHandlerHelper.java | 33 +-
.../consoleproxy/ConsoleProxyLoggerFactory.java | 103 +
.../cloud/consoleproxy/ConsoleProxyMonitor.java | 29 +-
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 47 +-
.../consoleproxy/ConsoleProxyNoVNCServer.java | 9 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 56 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 5 +-
.../cloud/consoleproxy/ConsoleProxyRdpClient.java | 16 +-
.../consoleproxy/ConsoleProxyResourceHandler.java | 45 +-
.../ConsoleProxySecureServerFactoryImpl.java | 27 +-
.../consoleproxy/ConsoleProxyThumbnailHandler.java | 31 +-
.../cloud/consoleproxy/ConsoleProxyVncClient.java | 18 +-
.../consoleproxy/rdp/RdpBufferedImageCanvas.java | 10 +-
.../java/com/cloud/consoleproxy/util/Logger.java | 223 ++
.../com/cloud/consoleproxy/util/LoggerFactory.java | 8 +-
.../java/com/cloud/consoleproxy/util/RawHTTP.java | 15 +-
.../consoleproxy/vnc/BufferedImageCanvas.java | 10 +-
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 69 +-
.../java/com/cloud/consoleproxy/vnc/VncClient.java | 42 +-
.../consoleproxy/vnc/VncClientPacketSender.java | 10 +-
.../consoleproxy/vnc/VncServerPacketReceiver.java | 12 +-
.../cloud/consoleproxy/vnc/network/NioSocket.java | 21 +-
.../vnc/network/NioSocketHandlerImpl.java | 8 +-
.../consoleproxy/vnc/network/NioSocketStream.java | 9 +-
.../vnc/network/NioSocketTLSInputStream.java | 5 +-
.../vnc/network/NioSocketTLSOutputStream.java | 6 +-
.../vnc/packet/server/AbstractRect.java | 5 -
.../consoleproxy/vnc/packet/server/RawRect.java | 4 +-
.../vnc/packet/server/ServerCutText.java | 8 +-
.../consoleproxy/vnc/security/VncAuthSecurity.java | 12 +-
.../consoleproxy/vnc/security/VncTLSSecurity.java | 8 +-
.../websocket/WebSocketReverseProxy.java | 6 +-
.../org.mockito.plugins.MockMaker | 1 +
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
.../PremiumSecondaryStorageManagerImpl.java | 14 +-
.../SecondaryStorageManagerImpl.java | 224 +-
.../SecondaryStorageManagerTest.java | 16 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 12 +-
.../storage/formatinspector/Qcow2Inspector.java | 5 +-
.../storage/resource/HttpUploadServerHandler.java | 5 +-
.../storage/resource/IpTablesHelper.java | 5 +-
.../resource/LocalNfsSecondaryStorageResource.java | 17 +-
.../resource/LocalSecondaryStorageResource.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 442 ++--
.../resource/SecondaryStorageDiscoverer.java | 32 +-
.../storage/template/DownloadManagerImpl.java | 97 +-
.../storage/template/UploadManagerImpl.java | 69 +-
...spring-secondary-storage-discoverer-context.xml | 2 +-
.../LocalNfsSecondaryStorageResourceTest.java | 3 +
.../resource/NfsSecondaryStorageResourceTest.java | 18 +-
.../org.mockito.plugins.MockMaker | 1 +
setup/bindir/cloud-migrate-databases.in | 4 +-
.../bindir/cloud-set-guest-password-configdrive.in | 4 +-
setup/bindir/cloud-setup-baremetal.in | 59 +-
setup/bindir/cloud-setup-databases.in | 3 +-
setup/bindir/cloud-setup-encryption.in | 75 +-
setup/db/221to222upgrade.sh | 10 +-
setup/db/22beta4to22GA.sql | 8 +-
setup/db/create-database-premium.sql | 4 +-
setup/db/create-database-simulator.sql | 4 +-
setup/db/create-database.sql | 14 +-
setup/db/create-schema-premium.sql | 10 +-
setup/db/create-schema-simulator.sql | 7 +-
setup/db/data-20to21.sql | 8 +-
setup/db/data-22beta1to22beta2.sql | 4 +-
setup/db/deploy-db-clouddev.sh | 4 +-
setup/db/deploy-db-dev.sh | 10 +-
setup/db/deploy-db-simulator.sh | 10 +-
setup/db/index-20to21.sql | 4 +-
setup/db/index-212to213.sql | 4 +-
setup/db/postprocess-20to21.sql | 4 +-
setup/db/server-setup.sql | 4 +-
setup/db/server-setup.xml | 38 +-
setup/db/templates.simulator.sql | 4 +-
setup/db/templates.sql | 4 +-
systemvm/agent/conf/log4j-cloud.xml | 198 +-
.../noVNC/keymaps/generate-language-keymaps.py | 2 +-
systemvm/agent/packages/packages.ini | 11 -
.../packages/python-is-python3_3.9.2-1_all.deb | Bin 2800 -> 0 bytes
.../packages/python3-netaddr_0.7.19-5_all.deb | Bin 253016 -> 0 bytes
systemvm/debian/etc/apache2/vhost.template | 2 +-
systemvm/debian/etc/vpcdnsmasq.conf | 2 +-
systemvm/debian/opt/cloud/bin/baremetal-vr.py | 4 +-
systemvm/debian/opt/cloud/bin/configure.py | 399 +--
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 130 +-
systemvm/debian/opt/cloud/bin/cs/CsApp.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsBgpPeers.py | 119 -
systemvm/debian/opt/cloud/bin/cs/CsConfig.py | 27 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 22 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsFile.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py | 6 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsMonitor.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 98 +-
systemvm/debian/opt/cloud/bin/cs/CsProcess.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 19 +-
systemvm/debian/opt/cloud/bin/cs/CsRoute.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsRule.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsStaticRoutes.py | 4 +-
.../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py | 17 +-
systemvm/debian/opt/cloud/bin/cs_bgppeers.py | 26 -
systemvm/debian/opt/cloud/bin/cs_dhcp.py | 6 +-
systemvm/debian/opt/cloud/bin/cs_firewallrules.py | 6 +-
.../debian/opt/cloud/bin/cs_forwardingrules.py | 6 +-
systemvm/debian/opt/cloud/bin/cs_guestnetwork.py | 8 +-
systemvm/debian/opt/cloud/bin/cs_ip.py | 2 +-
.../debian/opt/cloud/bin/cs_remoteaccessvpn.py | 4 +-
systemvm/debian/opt/cloud/bin/cs_site2sitevpn.py | 4 +-
systemvm/debian/opt/cloud/bin/cs_vpnusers.py | 8 +-
systemvm/debian/opt/cloud/bin/diagnostics.py | 4 +-
.../opt/cloud/bin/filesystem_writable_check.py | 6 +-
.../debian/opt/cloud/bin/get_diagnostics_files.py | 8 +-
systemvm/debian/opt/cloud/bin/merge.py | 14 +-
systemvm/debian/opt/cloud/bin/passwd_server_ip.py | 24 +-
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 7 -
.../debian/opt/cloud/bin/setup/cloud-early-config | 8 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 10 +-
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 2 -
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 1 -
systemvm/debian/opt/cloud/bin/setup/elbvm.sh | 1 -
systemvm/debian/opt/cloud/bin/setup/ilbvm.sh | 1 -
systemvm/debian/opt/cloud/bin/setup/init.sh | 8 +-
systemvm/debian/opt/cloud/bin/setup/patch.sh | 130 -
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 8 +-
systemvm/debian/opt/cloud/bin/setup/router.sh | 1 -
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 2 -
systemvm/debian/opt/cloud/bin/setup/sharedfsvm.sh | 64 -
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 1 -
systemvm/debian/opt/cloud/bin/update_config.py | 2 +-
systemvm/debian/opt/cloud/bin/vmdata.py | 50 +-
systemvm/debian/opt/cloud/bin/vr_cfg.sh | 2 +-
.../opt/cloud/templates/conntrackd.conf.templ | 2 +-
.../debian/root/health_checks/cpu_usage_check.py | 14 +-
systemvm/debian/root/health_checks/dhcp_check.py | 6 +-
.../debian/root/health_checks/disk_space_check.py | 6 +-
systemvm/debian/root/health_checks/dns_check.py | 6 +-
.../debian/root/health_checks/gateways_check.py | 8 +-
.../debian/root/health_checks/haproxy_check.py | 22 +-
.../debian/root/health_checks/iptables_check.py | 8 +-
.../root/health_checks/memory_usage_check.py | 16 +-
.../root/health_checks/router_version_check.py | 20 +-
.../debian/root/health_checks/utility/__init__.py | 2 +-
systemvm/debian/root/monitorServices.py | 18 +-
systemvm/patch-sysvms.sh | 18 +-
systemvm/pom.xml | 4 +-
systemvm/systemvm-agent-descriptor.xml | 7 -
systemvm/test/__init__.py | 20 -
systemvm/test/runtests.sh | 2 +-
test/bindirbak/cloud-run-test.in | 4 +-
test/conf/config.xml | 10 +-
test/conf/deploy.properties | 4 +-
test/conf/deploy.xml | 8 +-
test/conf/log4j-stdout.properties | 4 +-
test/conf/log4j.properties | 4 +-
test/conf/tool.properties | 4 +-
.../maint/testpath_disable_enable_zone.py | 2 +-
.../component/maint/testpath_vMotion_vmware.py | 2 +-
.../component/test_acl_sharednetwork.py | 2 +-
...est_acl_sharednetwork_deployVM-impersonation.py | 2 +-
.../component/test_advancedsg_networks.py | 188 +-
test/integration/component/test_assign_vm.py | 6 +-
.../component/test_deploy_vm_userdata_multi_nic.py | 2 +-
test/integration/component/test_egress_fw_rules.py | 6 +-
test/integration/component/test_interop_xd_ccp.py | 4 +-
.../component/test_multiple_nic_support.py | 44 +-
test/integration/component/test_project_limits.py | 2 +-
.../integration/component/test_ps_resize_volume.py | 6 +-
.../component/test_resource_limit_tags.py | 692 -----
test/integration/component/test_resource_limits.py | 2 +-
.../component/test_rootvolume_resize.py | 2 +-
test/integration/component/test_security_groups.py | 48 +-
.../component/test_snapshots_improvement.py | 2 +-
test/integration/component/test_tags.py | 2 +-
test/integration/plugins/linstor/README.md | 12 +-
test/integration/plugins/scaleio/README.md | 16 +-
.../plugins/storpool/TestStorPoolVolumes.py | 4 +-
test/integration/plugins/storpool/sp_util.py | 49 +-
.../plugins/storpool/test_storpool_tiers.py | 544 ----
.../integration/plugins/test_quota_tariff_order.py | 175 --
.../smoke/test_attach_multiple_volumes.py | 2 +-
test/integration/smoke/test_dynamicroles.py | 15 +-
.../test_enable_account_settings_for_domain.py | 4 +-
test/integration/smoke/test_global_settings.py | 49 -
test/integration/smoke/test_host_tags.py | 160 --
test/integration/smoke/test_ipv4_routing.py | 1673 ------------
test/integration/smoke/test_kubernetes_clusters.py | 2 +-
test/integration/smoke/test_migration.py | 2 +-
test/integration/smoke/test_network.py | 320 +--
test/integration/smoke/test_network_ipv6.py | 11 +-
test/integration/smoke/test_privategw_acl.py | 2 +-
.../smoke/test_privategw_acl_ovs_gre.py | 2 +-
test/integration/smoke/test_purge_expunged_vms.py | 371 ---
test/integration/smoke/test_resource_names.py | 299 ---
test/integration/smoke/test_restore_vm.py | 91 +-
test/integration/smoke/test_routers.py | 79 +-
test/integration/smoke/test_routers_network_ops.py | 32 +-
test/integration/smoke/test_scale_vm.py | 10 +-
test/integration/smoke/test_sharedfs_lifecycle.py | 277 --
test/integration/smoke/test_vm_life_cycle.py | 142 +-
test/integration/smoke/test_vm_strict_host_tags.py | 552 ----
test/integration/smoke/test_volumes.py | 27 -
test/integration/smoke/test_vpc_ipv6.py | 7 +-
test/integration/smoke/test_vpc_vpn.py | 2 +-
test/integration/smoke/test_webhook_delivery.py | 212 --
test/integration/smoke/test_webhook_lifecycle.py | 392 ---
test/integration/testpaths/testpath_usage.py | 84 +-
test/integration/testpaths/testpath_vmlc.py | 2 +-
test/metadata/adapter.xml | 20 +-
.../delegatedAdmin/delegated_admin_cleanup.xml | 16 +-
.../delegatedAdmin/delegated_admin_createusers.xml | 22 +-
.../delegated_admin_verify_part1.xml | 70 +-
.../delegated_admin_verify_part2.xml | 176 +-
.../pickuser_domainlevel1_domainlevel2.xml | 14 +-
...ickuser_domainlevel1admin_domainlevel1admin.xml | 14 +-
.../pickuser_domainlevel1admin_rootadmin.xml | 14 +-
.../pickuser_domainlevel2_child_domainlevel1.xml | 14 +-
...pickuser_domainlevel2_nonchild_domainlevel1.xml | 14 +-
.../pickuser_domainlevel2_rootadmin1.xml | 14 +-
.../pickuser_rootadmin1_rootadmin2.xml | 14 +-
.../pickuser_rootadmin_vs_domainlevel1admin.xml | 14 +-
test/metadata/func/directnw_regression.xml | 84 +-
test/metadata/func/error_events.properties | 4 +-
test/metadata/func/expunge.xml | 166 +-
test/metadata/func/external_firewall.xml | 60 +-
test/metadata/func/flatnetwork.xml | 76 +-
test/metadata/func/ha.xml | 48 +-
test/metadata/func/iso.xml | 122 +-
test/metadata/func/loadbalancers.xml | 228 +-
test/metadata/func/localstorage_volume_test.xml | 28 +-
test/metadata/func/mgmtvmsync.xml | 68 +-
test/metadata/func/portforwarding.xml | 94 +-
test/metadata/func/private_templates.xml | 92 +-
test/metadata/func/regression.xml | 432 +--
test/metadata/func/regression_events.properties | 4 +-
test/metadata/func/regression_new.xml | 106 +-
test/metadata/func/regression_test.xml | 496 ++--
test/metadata/func/regression_user.xml | 300 +--
test/metadata/func/regression_works.xml | 186 +-
test/metadata/func/resource_limits.xml | 326 +--
test/metadata/func/roughflatstress.xml | 92 +-
test/metadata/func/roughregression.xml | 546 ++--
test/metadata/func/sanity.xml | 48 +-
test/metadata/func/securitygroups.xml | 90 +-
test/metadata/func/sharedstorage_volume_test.xml | 194 +-
test/metadata/func/snapshot_iso.xml | 82 +-
test/metadata/func/snapshots.xml | 88 +-
test/metadata/func/snapshots_contd.xml | 84 +-
test/metadata/func/static_nat.xml | 170 +-
test/metadata/func/templatedwnldstress.xml | 120 +-
test/metadata/func/userapi.xml | 148 +-
test/metadata/func/vmapi.xml | 120 +-
test/metadata/func/vmsync.xml | 44 +-
test/pom.xml | 20 +-
test/scripts/bootstrap-regression.sh | 6 +-
test/scripts/build-env.sh | 6 +-
test/scripts/certDeleteEC2.sh | 6 +-
test/scripts/certSubmitEC2.sh | 6 +-
test/scripts/checkLog.sh | 6 +-
test/scripts/checkOutOfMemory.sh | 6 +-
test/scripts/cleanparallel.sh | 6 +-
test/scripts/deploy-and-run-regression.sh | 6 +-
test/scripts/deploy.sh | 6 +-
test/scripts/deploycluster.sh | 4 +-
test/scripts/executeUserAPI.sh | 6 +-
test/scripts/invoke.sh | 6 +-
test/scripts/regression.sh | 6 +-
test/scripts/run.sh | 6 +-
test/scripts/script_lock_test/test.sh | 4 +-
test/scripts/script_lock_test/test_task.sh | 4 +-
test/scripts/sign.sh | 6 +-
test/scripts/signEC2.sh | 6 +-
test/scripts/usage/allocated.sh | 6 +-
test/scripts/usage/network.sh | 6 +-
test/scripts/usage/running.sh | 6 +-
test/scripts/usage/volume_usage.sh | 6 +-
test/scripts/usercloud.properties | 4 +-
test/scripts/xen/corrupttemplate.sh | 6 +-
test/scripts/xen/createfaketemplate.sh | 6 +-
test/scripts/xen/killvm.sh | 6 +-
test/scripts/xen/listtemplate.sh | 6 +-
test/scripts/xen/listvdi.sh | 6 +-
test/scripts/xen/listvm.sh | 6 +-
test/scripts/xen/ms.sh | 6 +-
test/scripts/xen/removetemplate.sh | 8 +-
test/scripts/xen/shutdown.sh | 6 +-
test/scripts/xen/sleep.sh | 6 +-
test/scripts/xen/ssh.sh | 6 +-
.../java/com/cloud/test/regression/TestCase.java | 138 +
tools/apidoc/build-apidoc.sh | 6 +-
tools/apidoc/gen_toc.py | 125 +-
tools/apidoc/pom.xml | 4 +-
tools/appliance/build.sh | 2 +-
.../systemvmtemplate/http/preseed_x86_64.cfg | 2 +-
.../systemvmtemplate/scripts/apt_upgrade.sh | 4 +-
.../systemvmtemplate/scripts/configure_grub.sh | 2 +-
.../scripts/configure_systemvm_services.sh | 6 +-
.../scripts/install_systemvm_packages.sh | 27 +-
.../template-base_aarch64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_x86_64.json | 4 +-
tools/build/build_asf.sh | 8 +-
tools/build/installer/debinstall_full.sh | 8 +-
tools/build/installer/rpminstall_full.sh | 10 +-
tools/build/setnextversion.sh | 4 +-
tools/checkstyle/pom.xml | 2 +-
tools/checkstyle/src/main/resources/cloud-pmd.xml | 4 +-
.../checkstyle/src/main/resources/cloud-style.xml | 16 +-
tools/devcloud-kvm/devcloud-kvm.sql | 4 +-
tools/devcloud-kvm/kvm.properties | 4 +-
tools/devcloud-kvm/pom.xml | 4 +-
tools/devcloud4/README.md | 27 +-
tools/devcloud4/advanced/README.md | 20 +-
tools/devcloud4/basic/README.md | 14 +-
.../attributes/database_server.rb | 4 +-
.../binary-installation/attributes/default.rb | 4 +-
.../common/binary-installation/metadata.rb | 4 +-
.../binary-installation/recipes/database_server.rb | 4 +-
.../common/binary-installation/recipes/default.rb | 4 +-
.../recipes/management_server.rb | 4 +-
.../binary-installation/recipes/nfsshares.rb | 4 +-
tools/devcloud4/common/configure-network.sh | 4 +-
.../attributes/database_server.rb | 4 +-
.../development-installation/attributes/default.rb | 4 +-
.../files/default/createtmplt.sh | 20 +-
.../common/development-installation/metadata.rb | 4 +-
.../recipes/database_server.rb | 4 +-
.../development-installation/recipes/default.rb | 4 +-
.../development-installation/recipes/nfsshares.rb | 4 +-
.../recipes/system_templates.rb | 4 +-
tools/devcloud4/pom.xml | 2 +-
tools/devcloud4/prefill.sql | 4 +-
tools/docker/Dockerfile | 3 +-
tools/docker/Dockerfile.marvin | 5 +-
tools/docker/Dockerfile.smokedev | 2 +-
tools/docker/README.md | 4 +-
tools/docker/systemtpl.sh | 4 +-
tools/eclipse/set-eclipse-profile.sh | 44 +-
tools/marvin/CHANGES.txt | 4 +-
tools/marvin/DISCLAIMER.txt | 12 +-
tools/marvin/MANIFEST.in | 4 +-
tools/marvin/marvin/cloudstackException.py | 2 +-
tools/marvin/marvin/cloudstackTestCase.py | 2 +-
tools/marvin/marvin/config/test_data.py | 69 +-
tools/marvin/marvin/dbConnection.py | 2 +-
tools/marvin/marvin/deployDataCenter.py | 2 +-
tools/marvin/marvin/lib/base.py | 472 +---
tools/marvin/marvin/lib/ncc.py | 2 +-
tools/marvin/marvin/lib/utils.py | 4 +-
tools/marvin/marvin/misc/build/CI.md | 12 +-
tools/marvin/marvin/misc/build/README.md | 2 +-
tools/marvin/marvin/misc/build/kvm.properties | 4 +-
tools/marvin/marvin/misc/build/redeploy.sh | 6 +-
tools/marvin/marvin/misc/build/xen.properties | 4 +-
.../marvin/sandbox/advanced/setup.properties | 4 +-
.../marvin/sandbox/advancedsg/setup.properties | 4 +-
tools/marvin/marvin/sandbox/basic/setup.properties | 4 +-
.../demo/simulator/simulatordemo.properties | 4 +-
tools/marvin/marvin/sandbox/run-marvin.sh | 4 +-
tools/marvin/pom.xml | 56 +-
tools/marvin/setup.py | 2 +-
tools/ngui/static/js/lib/angular.js | 4 +-
tools/pom.xml | 2 +-
tools/transifex/README-transifex.txt | 4 +-
tools/transifex/sync-transifex-ui.sh | 10 +-
.../cloud_schema_comparision.sh | 10 +-
...test_config_between_fresh_and_upgraded_setup.sh | 12 +-
tools/whisker/descriptor-for-packaging.xml | 192 +-
tools/whisker/descriptor.xml | 186 +-
ui/README.md | 6 +-
ui/docs/development.md | 6 +-
ui/package.json | 1 -
ui/public/config.json | 2 -
ui/public/index.html | 2 +-
ui/public/locales/de_DE.json | 1 +
ui/public/locales/el_GR.json | 1 +
ui/public/locales/en.json | 422 +--
ui/public/locales/ja_JP.json | 1 +
ui/public/locales/ko_KR.json | 1 +
ui/public/locales/pt_BR.json | 94 +-
ui/public/locales/zh_CN.json | 1 +
ui/src/components/CheckBoxSelectPair.vue | 17 +-
ui/src/components/header/CreateMenu.vue | 32 +-
ui/src/components/header/HeaderNotice.vue | 8 +-
ui/src/components/page/GlobalFooter.vue | 22 -
ui/src/components/view/DetailSettings.vue | 13 +-
ui/src/components/view/DetailsTab.vue | 102 +-
ui/src/components/view/InfoCard.vue | 59 +-
.../InstanceVolumesStoragePoolSelectListView.vue | 7 +-
ui/src/components/view/ListResourceTable.vue | 4 -
ui/src/components/view/ListView.vue | 151 +-
ui/src/components/view/ResourceCountUsage.vue | 140 +-
ui/src/components/view/ResourceLimitTab.vue | 93 +-
ui/src/components/view/ResourceView.vue | 22 +-
ui/src/components/view/SearchView.vue | 247 +-
ui/src/components/view/SettingsTab.vue | 20 +-
ui/src/components/view/StatsTab.vue | 9 +-
ui/src/components/view/TestWebhookDeliveryView.vue | 278 --
ui/src/components/view/TreeView.vue | 6 +-
ui/src/components/view/VolumesTab.vue | 22 +-
ui/src/components/view/WebhookDeliveriesTab.vue | 526 ----
.../{DateTimeFilter.vue => stats/FilterStats.vue} | 14 +-
ui/src/components/widgets/Status.vue | 6 -
ui/src/config/router.js | 30 +-
ui/src/config/section/account.js | 21 +-
ui/src/config/section/compute.js | 46 +-
ui/src/config/section/config.js | 37 -
ui/src/config/section/image.js | 6 +-
ui/src/config/section/infra/clusters.js | 9 +-
ui/src/config/section/infra/hosts.js | 22 +-
ui/src/config/section/infra/managementServers.js | 8 +-
ui/src/config/section/infra/primaryStorages.js | 2 +-
ui/src/config/section/infra/routers.js | 2 +-
ui/src/config/section/infra/zones.js | 14 +-
ui/src/config/section/network.js | 111 +-
ui/src/config/section/offering.js | 19 +-
ui/src/config/section/plugin/quota.js | 101 +-
ui/src/config/section/role.js | 34 +-
ui/src/config/section/storage.js | 189 +-
ui/src/config/section/tools.js | 157 --
ui/src/config/section/user.js | 23 +-
ui/src/core/lazy_lib/components_use.js | 2 -
ui/src/core/lazy_lib/icons_use.js | 16 -
ui/src/layouts/UserLayout.vue | 5 +-
ui/src/locales/index.js | 2 +-
ui/src/main.js | 2 +-
ui/src/permission.js | 2 +-
ui/src/store/getters.js | 2 -
ui/src/store/modules/permission.js | 31 +-
ui/src/store/modules/user.js | 97 +-
ui/src/store/mutation-types.js | 2 -
ui/src/style/objects/form.scss | 36 -
ui/src/style/vars.less | 4 -
ui/src/utils/date.js | 104 -
ui/src/utils/plugins.js | 64 +-
ui/src/utils/quota.js | 124 -
ui/src/utils/request.js | 2 +-
ui/src/utils/util.js | 34 -
ui/src/views/AutogenView.vue | 80 +-
ui/src/views/auth/ForgotPassword.vue | 262 --
ui/src/views/auth/Login.vue | 27 +-
ui/src/views/auth/ResetPassword.vue | 319 ---
ui/src/views/compute/AssignInstance.vue | 167 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 25 +-
ui/src/views/compute/DeployVM.vue | 255 +-
ui/src/views/compute/DestroyVM.vue | 2 +-
ui/src/views/compute/EditVM.vue | 13 +-
ui/src/views/compute/InstanceTab.vue | 548 +++-
ui/src/views/compute/KubernetesServiceTab.vue | 10 +-
ui/src/views/compute/StartVirtualMachine.vue | 16 +-
ui/src/views/compute/backup/BackupSchedule.vue | 9 +-
.../views/compute/wizard/LoadBalancerSelection.vue | 9 -
ui/src/views/compute/wizard/OwnershipSelection.vue | 257 --
.../compute/wizard/SecurityGroupSelection.vue | 2 +-
ui/src/views/compute/wizard/UserDataSelection.vue | 10 +-
ui/src/views/dashboard/CapacityDashboard.vue | 22 +-
ui/src/views/dashboard/VerifyTwoFa.vue | 77 +-
ui/src/views/iam/AddAccount.vue | 4 +-
ui/src/views/iam/EditAccount.vue | 190 --
ui/src/views/iam/EditUser.vue | 18 +-
ui/src/views/iam/RolePermissionTab.vue | 27 +-
.../views/image/AddKubernetesSupportedVersion.vue | 36 +-
ui/src/views/image/RegisterOrUploadIso.vue | 44 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 47 +-
ui/src/views/image/UpdateISO.vue | 45 +-
ui/src/views/image/UpdateTemplate.vue | 52 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 18 +-
ui/src/views/infra/AddObjectStorage.vue | 2 +-
ui/src/views/infra/ChangeHostPassword.vue | 150 --
ui/src/views/infra/ClusterAdd.vue | 133 +-
ui/src/views/infra/HostEnableDisable.vue | 12 +-
ui/src/views/infra/HostInfo.vue | 26 +-
ui/src/views/infra/HostUpdate.vue | 183 --
ui/src/views/infra/ManagementServerPeerTab.vue | 111 -
ui/src/views/infra/Resources.vue | 93 +-
ui/src/views/infra/StorageBrowser.vue | 8 +-
ui/src/views/infra/UsageRecords.vue | 846 ------
ui/src/views/infra/network/ServiceProvidersTab.vue | 81 +-
ui/src/views/infra/zone/AsNumbersTab.vue | 229 --
ui/src/views/infra/zone/BgpPeersTab.vue | 762 ------
ui/src/views/infra/zone/IpAddressRangeForm.vue | 24 +-
ui/src/views/infra/zone/Ipv4GuestSubnetsTab.vue | 658 -----
ui/src/views/infra/zone/PhysicalNetworksTab.vue | 1 +
ui/src/views/infra/zone/ZoneWizard.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 14 -
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 91 +-
.../infra/zone/ZoneWizardNetworkSetupStep.vue | 102 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 -
ui/src/views/network/AclListRulesTab.vue | 107 +-
ui/src/views/network/ChangeBgpPeerForNetwork.vue | 187 --
ui/src/views/network/ChangeBgpPeerForVpc.vue | 187 --
.../views/network/CreateIpv4SubnetForNetwork.vue | 226 --
ui/src/views/network/CreateIsolatedNetworkForm.vue | 242 +-
ui/src/views/network/CreateL2NetworkForm.vue | 157 +-
ui/src/views/network/CreateNetwork.vue | 1 +
ui/src/views/network/CreateSharedNetworkForm.vue | 6 +-
ui/src/views/network/CreateVpc.vue | 135 +-
ui/src/views/network/EgressRulesTab.vue | 61 +-
ui/src/views/network/FirewallRules.vue | 63 +-
.../views/network/IngressEgressRuleConfigure.vue | 83 +-
ui/src/views/network/NicsTab.vue | 630 -----
ui/src/views/network/PublicIpResource.vue | 29 +-
ui/src/views/network/RoutingFirewallRulesTab.vue | 536 ----
ui/src/views/network/UpdateNetwork.vue | 10 +-
ui/src/views/network/VpcTab.vue | 8 +-
ui/src/views/network/VpcTiersTab.vue | 97 +-
ui/src/views/offering/AddComputeOffering.vue | 9 +-
ui/src/views/offering/AddDiskOffering.vue | 25 +-
ui/src/views/offering/AddNetworkOffering.vue | 269 +-
ui/src/views/offering/AddVpcOffering.vue | 362 +--
ui/src/views/plugins/ApiDocsPlugin.vue | 222 --
ui/src/views/plugins/quota/CreateQuotaTariff.vue | 201 --
ui/src/views/plugins/quota/EditQuotaTariff.vue | 188 --
.../quota/{QuotaSummary.vue => QuotaTariff.vue} | 42 +-
ui/src/views/setting/ConfigurationHierarchy.vue | 9 +-
ui/src/views/setting/ConfigurationValue.vue | 23 +-
.../views/storage/ChangeSharedFSDiskOffering.vue | 236 --
.../storage/ChangeSharedFSServiceOffering.vue | 204 --
ui/src/views/storage/CreateSharedFS.vue | 459 ----
ui/src/views/storage/CreateVolume.vue | 155 +-
ui/src/views/storage/MigrateVolume.vue | 2 +-
ui/src/views/storage/RecurringSnapshotVolume.vue | 2 +-
ui/src/views/storage/ResizeVolume.vue | 13 -
ui/src/views/storage/SharedFSTab.vue | 202 --
ui/src/views/storage/UpdateSharedFS.vue | 147 --
ui/src/views/tools/CreateWebhook.vue | 359 ---
ui/src/views/tools/ManageInstances.vue | 38 +-
ui/src/views/tools/TestWebhookDelivery.vue | 202 --
usage/conf/cloudstack-usage.logrotate.in | 28 -
usage/conf/db.properties.in | 4 -
usage/conf/log4j-cloud_usage.xml.in | 91 +-
usage/pom.xml | 6 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 5 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 438 ++--
.../java/com/cloud/usage/UsageSanityChecker.java | 58 +-
.../src/main/java/com/cloud/usage/UsageServer.java | 9 +-
.../com/cloud/usage/parser/BackupUsageParser.java | 5 +-
.../com/cloud/usage/parser/BucketUsageParser.java | 9 +-
.../cloud/usage/parser/IPAddressUsageParser.java | 24 +-
.../usage/parser/LoadBalancerUsageParser.java | 24 +-
.../usage/parser/NetworkOfferingUsageParser.java | 24 +-
.../com/cloud/usage/parser/NetworkUsageParser.java | 23 +-
.../cloud/usage/parser/NetworksUsageParser.java | 9 +-
.../usage/parser/PortForwardingUsageParser.java | 24 +-
.../usage/parser/SecurityGroupUsageParser.java | 24 +-
.../com/cloud/usage/parser/StorageUsageParser.java | 24 +-
.../java/com/cloud/usage/parser/UsageParser.java | 4 +-
.../cloud/usage/parser/VMInstanceUsageParser.java | 22 +-
.../usage/parser/VMSnapshotOnPrimaryParser.java | 28 +-
.../cloud/usage/parser/VMSnapshotUsageParser.java | 24 +-
.../com/cloud/usage/parser/VPNUserUsageParser.java | 24 +-
.../com/cloud/usage/parser/VmDiskUsageParser.java | 24 +-
.../com/cloud/usage/parser/VolumeUsageParser.java | 24 +-
.../com/cloud/usage/parser/VpcUsageParser.java | 11 +-
.../src/main/resources/usageApplicationContext.xml | 2 +-
.../com/cloud/usage/UsageAlertManagerImplTest.java | 2 +-
usage/src/test/resources/cloud_usage1.xml | 16 +-
usage/src/test/resources/cloud_usage2.xml | 16 +-
usage/src/test/resources/cloud_usage3.xml | 16 +-
utils/conf/log4j-vmops.xml | 158 +-
utils/pom.xml | 18 +-
.../java/com/cloud/utils/AutoCloseableUtil.java | 7 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 17 +-
.../main/java/com/cloud/utils/EncryptionUtil.java | 7 +-
utils/src/main/java/com/cloud/utils/FileUtil.java | 31 +-
utils/src/main/java/com/cloud/utils/HttpUtils.java | 15 +-
.../java/com/cloud/utils/HumanReadableJson.java | 5 +-
utils/src/main/java/com/cloud/utils/Journal.java | 6 +-
utils/src/main/java/com/cloud/utils/LogUtils.java | 35 +-
.../src/main/java/com/cloud/utils/ProcessUtil.java | 13 +-
.../main/java/com/cloud/utils/PropertiesUtil.java | 11 +-
.../src/main/java/com/cloud/utils/ReflectUtil.java | 14 +-
utils/src/main/java/com/cloud/utils/SwiftUtil.java | 27 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 72 +-
.../utils/backoff/impl/ConstantTimeBackoff.java | 5 +-
.../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 9 +-
.../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 49 +-
.../utils/cisco/n1kv/vsm/VsmPolicyMapResponse.java | 4 +-
.../cisco/n1kv/vsm/VsmPortProfileResponse.java | 4 +-
.../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 15 +-
.../cloud/utils/component/ComponentContext.java | 54 +-
.../ComponentInstantiationPostProcessor.java | 5 +-
.../utils/component/ComponentLifecycleBase.java | 5 +-
.../cloud/utils/compression/CompressionUtil.java | 5 +-
.../utils/concurrency/SynchronizationEvent.java | 9 +-
.../com/cloud/utils/crypt/CloudStackEncryptor.java | 19 +-
.../com/cloud/utils/crypt/DBEncryptionUtil.java | 9 +-
.../utils/crypt/EncryptionSecretKeyChecker.java | 11 +-
.../main/java/com/cloud/utils/crypt/RSAHelper.java | 7 +-
.../main/java/com/cloud/utils/db/DbProperties.java | 15 +-
.../com/cloud/utils/events/SubscriptionMgr.java | 11 +-
.../utils/exception/CSExceptionErrorCode.java | 7 +-
.../cloud/utils/log/CglibThrowableRenderer.java | 82 +
utils/src/main/java/com/cloud/utils/net/Dhcp.java | 2 +-
.../main/java/com/cloud/utils/net/HTTPUtils.java | 5 +-
.../main/java/com/cloud/utils/net/MacAddress.java | 5 -
.../main/java/com/cloud/utils/net/NetUtils.java | 170 +-
.../java/com/cloud/utils/net/NetworkProtocols.java | 362 ---
.../nicira/nvp/plugin/NiciraNvpApiVersion.java | 7 +-
.../java/com/cloud/utils/nio/HandlerFactory.java | 11 +-
utils/src/main/java/com/cloud/utils/nio/Link.java | 75 +-
.../main/java/com/cloud/utils/nio/NioClient.java | 74 +-
.../java/com/cloud/utils/nio/NioConnection.java | 210 +-
.../main/java/com/cloud/utils/nio/NioServer.java | 44 +-
.../java/com/cloud/utils/rest/BasicRestClient.java | 9 +-
.../com/cloud/utils/rest/RESTServiceConnector.java | 19 +-
.../com/cloud/utils/script/OutputInterpreter.java | 8 +-
.../main/java/com/cloud/utils/script/Script.java | 55 +-
.../main/java/com/cloud/utils/script/Script2.java | 2 +-
.../com/cloud/utils/server/ServerProperties.java | 5 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 21 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 35 +-
.../java/com/cloud/utils/storage/QCOW2Utils.java | 5 +-
.../java/com/cloud/utils/storage/S3/S3Utils.java | 5 +-
.../com/cloud/utils/storage/encoding/Decoder.java | 9 +-
.../java/com/cloud/utils/time/InaccurateClock.java | 11 +-
.../java/com/cloud/utils/xmlobject/XmlObject.java | 5 +-
.../apache/cloudstack/utils/cache/LazyCache.java | 48 -
.../apache/cloudstack/utils/cache/SingleCache.java | 48 -
.../utils/hypervisor/HypervisorUtils.java | 11 +-
.../utils/identity/ManagementServerNode.java | 4 +-
.../utils/imagestore/ImageStoreUtil.java | 19 +-
.../utils/jsinterpreter/JsInterpreter.java | 11 +-
.../utils/jsinterpreter/TagAsRuleHelper.java | 5 +-
.../cloudstack/utils/mailing/SMTPMailSender.java | 25 +-
.../cloudstack/utils/process/ProcessRunner.java | 31 +-
.../cloudstack/utils/redfish/RedfishClient.java | 55 +-
.../ReflectionToStringBuilderUtils.java | 5 +-
.../cloudstack/utils/security/CertUtils.java | 7 +-
.../cloudstack/utils/security/DigestHelper.java | 5 +-
.../cloudstack/utils/security/ParserUtils.java | 5 +-
.../apache/cloudstack/utils/security/SSLUtils.java | 5 +-
.../utils/security/SecureSSLSocketFactory.java | 7 +-
.../contrib/ssl/EasySSLProtocolSocketFactory.java | 9 +-
.../contrib/ssl/EasyX509TrustManager.java | 11 +-
.../src/test/java/com/cloud/utils/ScriptTest.java | 9 +-
.../test/java/com/cloud/utils/UriUtilsTest.java | 9 -
.../backoff/impl/ConstantTimeBackoffTest.java | 13 +-
.../utils/log/CglibThrowableRendererTest.java | 85 +
.../java/com/cloud/utils/net/NetUtilsTest.java | 84 +-
.../com/cloud/utils/net/NetworkProtocolsTest.java | 47 -
.../com/cloud/utils/rest/BasicRestClientTest.java | 2 +-
.../com/cloud/utils/rest/HttpRequestMatcher.java | 2 +-
.../cloud/utils/rest/RESTServiceConnectorTest.java | 2 +-
.../com/cloud/utils/security/SSLUtilsTest.java | 2 +-
.../java/com/cloud/utils/ssh/SshHelperTest.java | 2 +-
.../cloud/utils/testcase/Log4jEnabledTestCase.java | 5 +-
.../java/com/cloud/utils/testcase/NioTest.java | 82 +-
.../cloudstack/utils/cache/LazyCacheTest.java | 115 -
.../utils/hypervisor/HypervisorUtilsTest.java | 2 +-
.../utils/jsinterpreter/JsInterpreterTest.java | 4 +-
.../utils/mailing/SMTPMailSenderTest.java | 15 +-
.../cloudstack/utils/process/ProcessTest.java | 2 +-
.../utils/redfish/RedfishClientTest.java | 12 +-
.../ReflectionToStringBuilderUtilsTest.java | 10 +-
.../utils/volume/VirtualMachineDiskInfoTest.java | 2 +-
.../com/cloud/utils/QualifierTestContext.xml | 6 +-
.../utils/db/transactionContextBuilderTest.xml | 10 +-
utils/src/test/resources/log4j.xml | 137 +-
.../org.mockito.plugins.MockMaker | 1 +
utils/src/test/resources/testContext.xml | 6 +-
vmware-base/pom.xml | 12 +-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 23 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 172 +-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 20 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 40 +-
.../vmware/mo/DistributedVirtualSwitchMO.java | 10 +-
.../vmware/mo/HostDatastoreBrowserMO.java | 30 +-
.../hypervisor/vmware/mo/HostFirewallSystemMO.java | 2 +
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 241 +-
.../hypervisor/vmware/mo/HostNetworkSystemMO.java | 2 +
.../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 16 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 265 +-
.../vmware/mo/LicenseAssignmentManagerMO.java | 2 +
.../hypervisor/vmware/mo/LicenseManagerMO.java | 2 +
.../hypervisor/vmware/mo/PbmPlacementSolverMO.java | 2 +
.../hypervisor/vmware/mo/PbmProfileManagerMO.java | 8 +-
.../hypervisor/vmware/mo/SnapshotDescriptor.java | 9 +-
.../cloud/hypervisor/vmware/mo/StoragepodMO.java | 2 +
.../com/cloud/hypervisor/vmware/mo/TaskMO.java | 8 +-
.../hypervisor/vmware/mo/VirtualDiskManagerMO.java | 2 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 468 ++--
.../vmware/mo/VirtualStorageObjectManagerMO.java | 4 +-
.../hypervisor/vmware/mo/VmdkFileDescriptor.java | 13 +-
.../vmware/util/VcenterSessionHandler.java | 9 +-
.../cloud/hypervisor/vmware/util/VmwareClient.java | 87 +-
.../hypervisor/vmware/util/VmwareContext.java | 47 +-
.../hypervisor/vmware/util/VmwareContextPool.java | 19 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 47 +-
.../vmware/mo/HypervisorHostHelperTest.java | 44 -
.../vmware/mo/TestVmwareContextFactory.java | 9 +-
.../org.mockito.plugins.MockMaker | 1 +
4147 files changed, 44063 insertions(+), 129735 deletions(-)
delete mode 100644 .github/linters/.markdown-lint.yml
delete mode 100644 .github/linters/codespell.txt
delete mode 100644 agent/src/test/java/com/cloud/agent/AgentTest.java
create mode 100644 agent/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 api/src/main/java/com/cloud/agent/api/to/BucketTO.java
delete mode 100644 api/src/main/java/com/cloud/bgp/ASNumber.java
delete mode 100644 api/src/main/java/com/cloud/bgp/ASNumberRange.java
delete mode 100644 api/src/main/java/com/cloud/bgp/BGPService.java
delete mode 100644 api/src/main/java/com/cloud/cpu/CPU.java
delete mode 100644 api/src/main/java/com/cloud/network/element/BgpServiceProvider.java
delete mode 100644 api/src/main/java/com/cloud/network/nsx/NsxProvider.java
delete mode 100644 api/src/main/java/com/cloud/network/nsx/NsxService.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DisableRoleCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/EnableRoleCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/DeleteASNRangeCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/ListASNRangesCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/ReleaseASNumberCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListIpv4SubnetsForGuestNetworkCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListIpv4SubnetsForZoneCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateIpv4SubnetForZoneCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForVpcCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/DeleteBgpPeerCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ListBgpPeersCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/resource/PurgeExpungedResourcesCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/AddBackupRepositoryCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/DeleteBackupRepositoryCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/ListBackupRepositoriesCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/bgp/ListASNumbersCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkProtocolsCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/routing/CreateRoutingFirewallRuleCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/routing/DeleteRoutingFirewallRuleCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/routing/ListRoutingFirewallRulesCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/routing/UpdateRoutingFirewallRuleCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ExtractSnapshotCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSDiskOfferingCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/DestroySharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ExpungeSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ListSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ListSharedFSProvidersCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/RecoverSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/RestartSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/StartSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/StopSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/UpdateSharedFSCmd.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ASNRangeResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ASNumberResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/BackupRepositoryResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/BgpPeerResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/DataCenterIpv4SubnetResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/Ipv4RouteResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/Ipv4SubnetForGuestNetworkResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/NetworkProtocolResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/PeerManagementServerNodeResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/PurgeExpungedResourcesResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/SharedFSProviderResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/SharedFSResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/TaggedResourceLimitAndCountResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/backup/BackupRepository.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/backup/BackupRepositoryService.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/datacenter/DataCenterIpv4GuestSubnet.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceResponse.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/network/BgpPeer.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/network/BgpPeerTO.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/network/Ipv4GuestSubnetNetworkMap.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/network/RoutedIpv4Manager.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/resource/ResourceCleanupService.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSLifeCycle.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSProvider.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSService.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/bgp/DeleteASNRangeCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/bgp/ListASNRangesCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/bgp/ReleaseASNumberCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/ListIpv4SubnetsForGuestNetworkCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/ListIpv4SubnetsForZoneCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/UpdateIpv4SubnetForZoneCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForVpcCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DeleteBgpPeerCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ListBgpPeersCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/resource/PurgeExpungedResourcesCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdminTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/bgp/ListASNumbersCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/ListNetworkProtocolsCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/CreateRoutingFirewallRuleCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/DeleteRoutingFirewallRuleCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/ListRoutingFirewallRulesCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/UpdateRoutingFirewallRuleCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/response/ASNRangeResponseTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/response/ASNumberResponseTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/response/BgpPeerResponseTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/response/DataCenterIpv4SubnetResponseTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/response/Ipv4RouteResponseTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/api/response/Ipv4SubnetForGuestNetworkResponseTest.java
delete mode 100644 api/src/test/java/org/apache/cloudstack/network/BgpPeerTOTest.java
create mode 100644 api/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 core/src/main/java/com/cloud/agent/api/routing/SetBgpPeersAnswer.java
delete mode 100644 core/src/main/java/com/cloud/agent/api/routing/SetBgpPeersCommand.java
delete mode 100644 core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetBgpPeersConfigItem.java
delete mode 100644 core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/BgpPeers.java
delete mode 100644 core/src/main/java/com/cloud/agent/transport/StoragePoolTypeAdaptor.java
delete mode 100644 core/src/main/java/org/apache/cloudstack/backup/BackupAnswer.java
delete mode 100644 core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
delete mode 100644 core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
delete mode 100644 core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
delete mode 100644 core/src/main/java/org/apache/cloudstack/transport/HypervisorTypeAdaptor.java
delete mode 100644 core/src/main/resources/META-INF/cloudstack/event/module.properties
delete mode 100644 core/src/main/resources/META-INF/cloudstack/event/spring-core-lifecycle-event-context-inheritable.xml
delete mode 100644 core/src/test/java/com/cloud/agent/api/GetStorageStatsAnswerTest.java
delete mode 100644 core/src/test/java/com/cloud/agent/api/routing/SetBgpPeersAnswerTest.java
delete mode 100644 core/src/test/java/com/cloud/agent/api/routing/SetBgpPeersCommandTest.java
delete mode 100644 core/src/test/java/com/cloud/agent/resource/virtualnetwork/facade/SetBgpPeersConfigItemTest.java
delete mode 100644 core/src/test/java/com/cloud/agent/resource/virtualnetwork/model/BgpPeersTest.java
delete mode 100644 core/src/test/java/com/cloud/agent/transport/LoggingExclusionStrategyTest.java
delete mode 100644 core/src/test/java/com/cloud/serializer/GsonHelperTest.java
create mode 100644 core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/components-api/src/test/java/com/cloud/network/NetworkStateListenerTest.java
delete mode 100644 engine/orchestration/src/test/java/com/cloud/vm/VirtualMachinePowerStateSyncImplTest.java
delete mode 100644 engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtilityTest.java
create mode 100644 engine/orchestration/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/schema/src/main/java/com/cloud/dc/ASNumberRangeVO.java
delete mode 100644 engine/schema/src/main/java/com/cloud/dc/ASNumberVO.java
delete mode 100644 engine/schema/src/main/java/com/cloud/dc/dao/ASNumberDao.java
delete mode 100644 engine/schema/src/main/java/com/cloud/dc/dao/ASNumberDaoImpl.java
delete mode 100644 engine/schema/src/main/java/com/cloud/dc/dao/ASNumberRangeDao.java
delete mode 100644 engine/schema/src/main/java/com/cloud/dc/dao/ASNumberRangeDaoImpl.java
delete mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NsxProviderDao.java
delete mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NsxProviderDaoImpl.java
delete mode 100644 engine/schema/src/main/java/com/cloud/network/element/NsxProviderVO.java
delete mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeAbstractImpl.java
delete mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41910to42000.java
delete mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java
delete mode 100644 engine/schema/src/main/java/com/cloud/util/StoragePoolTypeConverter.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/backup/BackupRepositoryVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupRepositoryDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupRepositoryDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/datacenter/DataCenterIpv4GuestSubnetVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/datacenter/dao/DataCenterIpv4GuestSubnetDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/datacenter/dao/DataCenterIpv4GuestSubnetDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/BgpPeerDetailsVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/BgpPeerNetworkMapVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/BgpPeerVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/Ipv4GuestSubnetNetworkMapVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerDetailsDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerDetailsDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerNetworkMapDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/BgpPeerNetworkMapDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSVO.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/dao/SharedFSDao.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/dao/SharedFSDaoImpl.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/util/CPUArchConverter.java
delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/util/HypervisorTypeConverter.java
delete mode 100644 engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_add_foreign_key.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41910to42000-cleanup.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42000to42010-cleanup.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.mshost_peer_view.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.shared_filesystem_view.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.webhook_delivery_view.sql
delete mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.webhook_view.sql
delete mode 100644 engine/schema/src/test/java/com/cloud/capacity/dao/CapacityDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/dc/dao/ClusterDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/host/dao/HostDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/network/dao/IPAddressDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/network/dao/LoadBalancerVMMapDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/network/dao/OpRouterMonitorServiceDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/network/rules/dao/PortForwardingRulesDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/secstorage/CommandExecLogDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade41700to41710Test.java
delete mode 100644 engine/schema/src/test/java/com/cloud/vm/ItWorkDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/vm/dao/ConsoleSessionDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/vm/dao/NicDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/vm/dao/NicExtraDhcpOptionDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/vm/dao/NicSecondaryIpDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImplTest.java
delete mode 100644 engine/schema/src/test/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBaseTest.java
delete mode 100644 engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImplTest.java
create mode 100644 engine/schema/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/storage/configdrive/src/main/java/org/apache/cloudstack/storage/configdrive/ConfigDriveUtils.java
delete mode 100644 engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveUtilsTest.java
create mode 100644 engine/storage/configdrive/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImplTest.java
create mode 100644 engine/storage/object/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 engine/storage/snapshot/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImplTest.java
delete mode 100644 framework/cluster/src/main/java/com/cloud/cluster/ManagementServerHostPeerJoinVO.java
delete mode 100644 framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerJoinDao.java
delete mode 100644 framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostPeerJoinDaoImpl.java
delete mode 100644 framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapper.java
delete mode 100644 framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapperTest.java
delete mode 100644 framework/events/src/main/java/org/apache/cloudstack/framework/events/EventDistributor.java
delete mode 100644 framework/events/src/main/java/org/apache/cloudstack/framework/events/EventDistributorImpl.java
delete mode 100644 framework/events/src/test/java/org/apache/cloudstack/framework/events/EventDistributorImplTest.java
delete mode 100644 framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImplTest.java
delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableDefinition.java
delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Tariff.java
delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaEmailConfigurationDao.java
delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaEmailConfigurationDaoImpl.java
delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaEmailConfigurationVO.java
copy packaging/{el8 => centos7}/cloud-ipallocator.rc (100%)
copy packaging/{el8 => centos7}/cloud.limits (100%)
copy packaging/{el8 => centos7}/cloud.spec (88%)
copy packaging/{el8 => centos7}/cloudstack-agent.te (100%)
copy packaging/{el8 => centos7}/cloudstack-sccs (100%)
copy packaging/{el8 => centos7}/filelimit.conf (100%)
copy packaging/{el8 => centos7}/replace.properties (97%)
delete mode 120000 packaging/centos8
rename packaging/{el8 => centos8}/cloud-ipallocator.rc (100%)
rename packaging/{el8 => centos8}/cloud.limits (100%)
rename packaging/{el8 => centos8}/cloud.spec (95%)
rename packaging/{el8 => centos8}/cloudstack-agent.te (100%)
rename packaging/{el8 => centos8}/cloudstack-sccs (100%)
rename packaging/{el8 => centos8}/filelimit.conf (100%)
rename packaging/{el8 => centos8}/replace.properties (99%)
create mode 100644 plugins/acl/project-role-based/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/backup/nas/pom.xml
delete mode 100644 plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
delete mode 100644 plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NasBackupOffering.java
delete mode 100644 plugins/backup/nas/src/main/resources/META-INF/cloudstack/nas/module.properties
delete mode 100644 plugins/backup/nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml
delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaConfigureEmailCmd.java
delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaListEmailConfigurationCmd.java
delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaPresetVariablesListCmd.java
delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaConfigureEmailResponse.java
delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaPresetVariablesItemResponse.java
create mode 100644 plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/event-bus/webhook/pom.xml
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/Webhook.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookApiService.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookApiServiceImpl.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookDelivery.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookDeliveryThread.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookEventBus.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookService.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookServiceImpl.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/CreateWebhookCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/DeleteWebhookCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/DeleteWebhookDeliveryCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/ExecuteWebhookDeliveryCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/ListWebhookDeliveriesCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/ListWebhooksCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/UpdateWebhookCmd.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/response/WebhookDeliveryResponse.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/response/WebhookResponse.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDao.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDaoImpl.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryDao.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryDaoImpl.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryJoinDao.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryJoinDaoImpl.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookJoinDao.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookJoinDaoImpl.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookDeliveryJoinVO.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookDeliveryVO.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookJoinVO.java
delete mode 100644 plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookVO.java
delete mode 100644 plugins/event-bus/webhook/src/main/resources/META-INF/cloudstack/webhook/module.properties
delete mode 100644 plugins/event-bus/webhook/src/main/resources/META-INF/cloudstack/webhook/spring-event-webhook-context.xml
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookApiServiceImplTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookDeliveryThreadTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookEventBusTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/CreateWebhookCmdTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/DeleteWebhookCmdTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/DeleteWebhookDeliveryCmdTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/ExecuteWebhookDeliveryCmdTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/ListWebhookDeliveriesCmdTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/ListWebhooksCmdTest.java
delete mode 100644 plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/UpdateWebhookCmdTest.java
delete mode 100644 plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtExtendedVmStatsEntry.java
delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
delete mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtCpuTopologyTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/hypervisors/vmware/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/hypervisors/xenserver/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/integrations/cloudian/src/test/java/org/apache/cloudstack/cloudian/CloudianUtilsTest.java
create mode 100644 plugins/integrations/kubernetes-service/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/network-elements/elastic-loadbalancer/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/network-elements/nsx/pom.xml
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/NsxAnswer.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/StartupNsxCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxDhcpRelayConfigCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxDistributedFirewallRulesCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxLoadBalancerRuleCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxPortForwardRuleCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxSegmentCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxStaticNatCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxTier1GatewayCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNsxTier1NatRuleCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxDistributedFirewallRulesCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxLoadBalancerRuleCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxNatRuleCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxSegmentCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxTier1GatewayCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxNetworkCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/AddNsxControllerCmd.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/ListNsxControllersCmd.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/response/NsxControllerResponse.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxLoadBalancerMember.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxProviderService.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxProviderServiceImpl.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxControllerUtils.java
delete mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxHelper.java
delete mode 100644 plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/core/spring-nsx-core-managers-context.xml
delete mode 100644 plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/module.properties
delete mode 100644 plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/spring-nsx-context.xml
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxProviderServiceImplTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxServiceImplTest.java
delete mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/utils/NsxControllerUtilsTest.java
create mode 100644 plugins/network-elements/tungsten/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/storage/object/ceph/pom.xml
delete mode 100644 plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java
delete mode 100644 plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CephObjectStoreLifeCycleImpl.java
delete mode 100644 plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/provider/CephObjectStoreProviderImpl.java
delete mode 100644 plugins/storage/object/ceph/src/main/resources/META-INF/cloudstack/storage-object-ceph/module.properties
delete mode 100644 plugins/storage/object/ceph/src/main/resources/META-INF/cloudstack/storage-object-ceph/spring-storage-object-ceph-context.xml
delete mode 100644 plugins/storage/object/ceph/src/test/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImplTest.java
delete mode 100644 plugins/storage/object/ceph/src/test/java/org/apache/cloudstack/storage/datastore/provider/CephObjectStoreProviderImplTest.java
delete mode 100644 plugins/storage/sharedfs/storagevm/pom.xml
delete mode 100644 plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
delete mode 100644 plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/provider/StorageVmSharedFSProvider.java
delete mode 100644 plugins/storage/sharedfs/storagevm/src/main/resources/META-INF/cloudstack/sharedfs-provider-storagevm/module.properties
delete mode 100644 plugins/storage/sharedfs/storagevm/src/main/resources/META-INF/cloudstack/sharedfs-provider-storagevm/spring-sharedfs-provider-storagevm-context.xml
delete mode 100644 plugins/storage/sharedfs/storagevm/src/main/resources/conf/fsvm-init.yml
delete mode 100644 plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
create mode 100644 plugins/storage/volume/scaleio/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolVolumeDef.java
create mode 100644 plugins/user-authenticators/ldap/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100755 scripts/vm/hypervisor/kvm/nasbackup.sh
delete mode 100644 server/conf/cloudstack-management.logrotate.in
delete mode 100644 server/src/main/java/com/cloud/api/auth/DefaultForgotPasswordAPIAuthenticatorCmd.java
delete mode 100644 server/src/main/java/com/cloud/api/auth/DefaultResetPasswordAPIAuthenticatorCmd.java
copy server/src/main/java/com/cloud/api/query/dao/{ManagementServerJoinDao.java => HostTagDao.java} (74%)
create mode 100644 server/src/main/java/com/cloud/api/query/dao/HostTagDaoImpl.java
copy engine/schema/src/main/java/com/cloud/host/DetailVO.java => server/src/main/java/com/cloud/api/query/vo/HostTagVO.java (67%)
delete mode 100644 server/src/main/java/com/cloud/bgp/BGPServiceImpl.java
delete mode 100644 server/src/main/java/com/cloud/network/rules/BgpPeersRules.java
create mode 100644 server/src/main/java/com/cloud/test/TestAppender.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/backup/BackupRepositoryServiceImpl.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSServiceImpl.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/storage/sharedfs/query/dao/SharedFSJoinDao.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/storage/sharedfs/query/dao/SharedFSJoinDaoImpl.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/storage/sharedfs/query/vo/SharedFSJoinVO.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManager.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManagerImpl.java
delete mode 100644 server/src/main/java/org/apache/cloudstack/webhook/WebhookHelper.java
delete mode 100644 server/src/test/java/com/cloud/bgp/BGPServiceImplTest.java
delete mode 100644 server/src/test/java/com/cloud/capacity/CapacityManagerImplTest.java
delete mode 100644 server/src/test/java/com/cloud/ha/dao/HighAvailabilityDaoImplTest.java
delete mode 100644 server/src/test/java/com/cloud/network/rules/BgpPeersRulesTest.java
delete mode 100644 server/src/test/java/org/apache/cloudstack/network/RoutedIpv4ManagerImplTest.java
delete mode 100644 server/src/test/java/org/apache/cloudstack/resource/ResourceCleanupServiceImplTest.java
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
delete mode 100644 server/src/test/java/org/apache/cloudstack/storage/sharedfs/SharedFSServiceImplTest.java
delete mode 100644 server/src/test/java/org/apache/cloudstack/storage/sharedfs/query/dao/SharedFSJoinDaoImplTest.java
delete mode 100644 server/src/test/java/org/apache/cloudstack/user/UserPasswordResetManagerImplTest.java
create mode 100644 server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 services/console-proxy/rdpconsole/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyLoggerFactory.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/Logger.java
copy api/src/main/java/com/cloud/capacity/CapacityState.java => services/console-proxy/server/src/main/java/com/cloud/consoleproxy/util/LoggerFactory.java (88%)
create mode 100644 services/console-proxy/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 services/secondary-storage/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 systemvm/agent/packages/packages.ini
delete mode 100644 systemvm/agent/packages/python-is-python3_3.9.2-1_all.deb
delete mode 100644 systemvm/agent/packages/python3-netaddr_0.7.19-5_all.deb
delete mode 100755 systemvm/debian/opt/cloud/bin/cs/CsBgpPeers.py
delete mode 100755 systemvm/debian/opt/cloud/bin/cs_bgppeers.py
delete mode 100755 systemvm/debian/opt/cloud/bin/setup/patch.sh
delete mode 100644 systemvm/debian/opt/cloud/bin/setup/sharedfsvm.sh
delete mode 100755 systemvm/test/__init__.py
delete mode 100644 test/integration/component/test_resource_limit_tags.py
delete mode 100644 test/integration/plugins/storpool/test_storpool_tiers.py
delete mode 100644 test/integration/plugins/test_quota_tariff_order.py
delete mode 100644 test/integration/smoke/test_host_tags.py
delete mode 100644 test/integration/smoke/test_ipv4_routing.py
delete mode 100644 test/integration/smoke/test_purge_expunged_vms.py
delete mode 100644 test/integration/smoke/test_resource_names.py
delete mode 100644 test/integration/smoke/test_sharedfs_lifecycle.py
delete mode 100644 test/integration/smoke/test_vm_strict_host_tags.py
delete mode 100644 test/integration/smoke/test_webhook_delivery.py
delete mode 100644 test/integration/smoke/test_webhook_lifecycle.py
create mode 100644 test/src-not-used/main/java/com/cloud/test/regression/TestCase.java
delete mode 100644 ui/src/components/view/TestWebhookDeliveryView.vue
delete mode 100644 ui/src/components/view/WebhookDeliveriesTab.vue
rename ui/src/components/view/{DateTimeFilter.vue => stats/FilterStats.vue} (93%)
delete mode 100644 ui/src/style/objects/form.scss
delete mode 100644 ui/src/utils/date.js
delete mode 100644 ui/src/utils/quota.js
delete mode 100644 ui/src/views/auth/ForgotPassword.vue
delete mode 100644 ui/src/views/auth/ResetPassword.vue
delete mode 100644 ui/src/views/compute/wizard/OwnershipSelection.vue
delete mode 100644 ui/src/views/iam/EditAccount.vue
delete mode 100644 ui/src/views/infra/ChangeHostPassword.vue
delete mode 100644 ui/src/views/infra/HostUpdate.vue
delete mode 100644 ui/src/views/infra/ManagementServerPeerTab.vue
delete mode 100644 ui/src/views/infra/UsageRecords.vue
delete mode 100644 ui/src/views/infra/zone/AsNumbersTab.vue
delete mode 100644 ui/src/views/infra/zone/BgpPeersTab.vue
delete mode 100644 ui/src/views/infra/zone/Ipv4GuestSubnetsTab.vue
delete mode 100644 ui/src/views/network/ChangeBgpPeerForNetwork.vue
delete mode 100644 ui/src/views/network/ChangeBgpPeerForVpc.vue
delete mode 100644 ui/src/views/network/CreateIpv4SubnetForNetwork.vue
delete mode 100644 ui/src/views/network/NicsTab.vue
delete mode 100644 ui/src/views/network/RoutingFirewallRulesTab.vue
delete mode 100644 ui/src/views/plugins/ApiDocsPlugin.vue
delete mode 100644 ui/src/views/plugins/quota/CreateQuotaTariff.vue
delete mode 100644 ui/src/views/plugins/quota/EditQuotaTariff.vue
copy ui/src/views/plugins/quota/{QuotaSummary.vue => QuotaTariff.vue} (60%)
delete mode 100644 ui/src/views/storage/ChangeSharedFSDiskOffering.vue
delete mode 100644 ui/src/views/storage/ChangeSharedFSServiceOffering.vue
delete mode 100644 ui/src/views/storage/CreateSharedFS.vue
delete mode 100644 ui/src/views/storage/SharedFSTab.vue
delete mode 100644 ui/src/views/storage/UpdateSharedFS.vue
delete mode 100644 ui/src/views/tools/CreateWebhook.vue
delete mode 100644 ui/src/views/tools/TestWebhookDelivery.vue
delete mode 100644 usage/conf/cloudstack-usage.logrotate.in
create mode 100644 utils/src/main/java/com/cloud/utils/log/CglibThrowableRenderer.java
delete mode 100644 utils/src/main/java/com/cloud/utils/net/NetworkProtocols.java
delete mode 100644 utils/src/main/java/org/apache/cloudstack/utils/cache/LazyCache.java
delete mode 100644 utils/src/main/java/org/apache/cloudstack/utils/cache/SingleCache.java
create mode 100644 utils/src/test/java/com/cloud/utils/log/CglibThrowableRendererTest.java
delete mode 100644 utils/src/test/java/com/cloud/utils/net/NetworkProtocolsTest.java
delete mode 100644 utils/src/test/java/org/apache/cloudstack/utils/cache/LazyCacheTest.java
create mode 100644 utils/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 vmware-base/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(cloudstack) 01/01: Smoke test vmware: Fix test_network_permission failure seen on vmware
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch fix-ntw-perm-test-vmware
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fca85033fc747f47f973407bf62e83e19c8456a5
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Thu Apr 24 11:01:07 2025 +0530
Smoke test vmware: Fix test_network_permission failure seen on vmware
---
test/integration/smoke/test_network_permissions.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/test/integration/smoke/test_network_permissions.py b/test/integration/smoke/test_network_permissions.py
index cd55c5af745..fe2c685684d 100644
--- a/test/integration/smoke/test_network_permissions.py
+++ b/test/integration/smoke/test_network_permissions.py
@@ -733,6 +733,12 @@ class TestNetworkPermissions(cloudstackTestCase):
self.exec_command("self.user_apiclient", command, expected=False)
self.exec_command("self.otheruser_apiclient", command, expected=True)
+ # 21a. Start vm2 before destroying - as restore VM removes root volume causing failure to destroy VM on VMware
+ if self.hypervisor.lower() in ["vmware"]:
+ command = """self.virtual_machine.start({apiclient})"""
+ self.exec_command("self.user_apiclient", command, expected=False)
+ self.exec_command("self.otheruser_apiclient", command, expected=True)
+
# 22. Destroy vm2, should succeed by vm owner
command = """self.virtual_machine.delete({apiclient}, expunge=False)"""
self.exec_command("self.user_apiclient", command, expected=False)