This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch patch-vpc-with-non-implemented-nws
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 4a125fee708 VR live patching: Allow live patch of VPC VRs even if
networks are in allocated / shutdown state
omit 3ec30076356 Generate coverage for Simulator based integration tests &
ui tests in github actions (#7784)
omit c4e53c0095b Allow editing of host and storage tags of system offerings
in the UI (#7941)
omit 940733cedfb UI: Fix user role login due to missing API access on
custom hypervisor name (#7939)
omit 710f34ee90c api: Fix listLoadBalancerRuleInstances api call (#7892)
omit f6b2a587272 Merge branch '4.18'
omit 54a7a5d7e1d utils: rename cloud-utils-*-SHADED.jar to
cloud-utils-*-bundled.jar to fix the build error on MacOS (#7944)
omit 2e6100d85bb utils: build both SHADED and original jars (#7912)
omit 5917fed773c refactor getUploadParamsForIso (#7813)
omit 78411fd405c test: fix test_vm_autoscaling.py which does not work due
to userdata improvement (#7921)
omit 819dd7b75c1 server: remove supportedOwner from Resource.ResourceType
(#7416)
omit 2f701e1f893 New configs for quota email's headers and footers (#7852)
omit 40d7da6707d Merge release branch 4.18 to main
omit 7362e5338c9 Merge remote-tracking branch 'origin/4.18'
omit f563c165cb3 Merge release branch 4.18 to main
omit 24ae5aa5fad Merge branch '4.18'
omit 3b05797344c Merge remote-tracking branch 'origin/4.18'
omit c683de4a55b kvm: fix unit test LibvirtReplugNicCommandWrapperTest
(#7908)
omit 47b6f0fd056 Fix tungsten unit test (#7904)
omit 7cdf864c71d Merge release branch 4.18 to main
omit 594d212a8bc Merge branch '4.18'
omit 27f148e79e7 Merge branch '4.18'
omit 2ef159eeb84 merge issues
omit ea832bce136 Merge branch '4.18'
omit 0bd7462c54a Link README logo to website (#7884)
omit 0b4afedb5b5 pre-commit: add hook to check for the existence of private
keys (#7805)
omit 9083a677ae1 systeminstances field (#7871)
omit 1065e9046b1 Fix backup dates (#6473)
omit 7049a6058d2 UI: Add domain and account fields to Register/Upload
Template/ISO view (#7872)
omit b0ae701ca4e Remove Super-Linter action and move `flake8` to pre-commit
(#7861)
omit 8b5ba13b817 plugins: Add Custom hypervisor minimal changes (#7692)
omit fe70f4d801c Remove powermock from services (#7860)
omit 5559668f126 Merge branch '4.18'
omit 0204377032f Fix UI unit tests (#7856)
omit d22a3d517d8 ui: fix conflict/regression found in AutogenView
omit 62feb24de65 Merge remote-tracking branch 'origin/4.18'
omit 540dcc1040a Merge remote-tracking branch 'apache/4.18'
omit 9bc0dd7a690 pre-commit fix line ending (#7851)
omit 7b64236469c Merge release branch 4.18 to main
omit 82f91066338 Remove powermock from kvm hypervisor plugin (#7818)
omit 927818b55ff added docker command for ubuntu 22.04 to Building DEB
packages (#7315)
omit ac882f3d07c Merge remote-tracking branch 'origin/4.18'
omit 32448e1ac7b Merge branch '4.18'
omit 55f0801b18e Remove powermock from network elements (#7791)
omit 0318e9fccb9 test_vm_deployment_planner: fix using wrong hypervisor
(#7718)
omit eb31e3d7950 Merge release branch 4.18 to main
omit 84974a1e086 Remove powermock from vmware-base & vmware hypervisor
plugin (#7798)
omit 90443cdd431 Remove powermock from xenserver hypervisor plugin (#7806)
omit e3bd2c0a8cf Merge branch '4.18'
omit 7ee697fcc5c Merge release branch 4.18 to main
omit 6f4503488be pre-commit: apply `end-of-file-fixer` to all files (#7551)
omit e876ef096ef Fix links to `release notes` in README and CHANGES (#7797)
omit 0d9292c9ea1 Remove powermock from database/quota plugin (#7795)
omit d51d8a4a13b Merge release branch 4.18 to main
omit 0bab0db881b Introducing concept of domain VPCs (#7153)
omit a738204e8ad Remove powermock from nicira nvp (#7789)
omit 665fb83e73c Remove powermock from kubernetes plugin (#7788)
omit 8db8aa41637 Merge branch '4.18'
omit 7042ce4ad05 Run startServer in tearDown for test_safe_shutdown to
ensure management server is up even if the tests fail (#7767)
omit 62a8f4ef72a Merge remote-tracking branch 'origin/4.18'
omit afec876951f Merge release branch 4.18 to main
omit 729e6d14465 userdata: fix append scenarios (#7741)
omit 6bb95c02006 Merge release branch 4.18 to main
omit b5eebc4347a Fix codecov github action (#7747)
omit caaf25b6951 test: fix ci failures on main branch (#7733)
omit b1fc2798726 Generate cloud-init multipart user data for template
append policy (#7643)
omit 5383bf64f43 Merge remote-tracking branch 'origin/4.18'
omit c956d329f5d Fix test_vm_schedule's intermittent failures (#7726)
omit d2cd3c81cbf Fix lint errors (#7727)
omit a706bf2380e Merge branch '4.18'
omit 2132f46fcb3 Merge branch '4.18'
omit 02be2cdf67d Merge release branch 4.18 to main
omit fbb9dec6e5c Merge release branch 4.18 to main
omit 70d5470f488 If ResourceCountCheckTask throws an exception the
scheduled task is not going to run again until the management servers are
restarted. (#7670)
omit 3c5fdeafdc0 [Veeam] restored VMs without NICs (#6282)
omit 3b054b26653 Merge remote-tracking branch 'origin/4.18'
omit 2fcbe6241f2 cks: Add unmanaged kubernetes cluster (#7515)
omit c6237c48aca Retrieve only resource count on user dashboard (#7617)
omit 5975ea80c97 Merge remote-tracking branch 'origin/4.18'
omit 41403c9cf9f Merge remote-tracking branch 'apache/4.18'
omit c3718ab92e9 Fix storpool test & remove powermock (#7652)
omit 908b3b7dfa3 Remove powermock from ldap & project-role-based plugin
(#7658)
omit 06caf32bc8c Guest os mappings improvements (#6979)
omit fa3f2a75eb5 feature: VM Scheduler (#7397)
omit 409e3202a3c Fix and enable tests for storage plugins (#7657)
omit 0466bf9d471 server,api,ui: host auto-select for
migrateVirtualMachineWithVolume (#7554)
omit cb4e35f44b0 [main] Bump version to 4.19.0.0-SNAPSHOT (#7665)
omit b635ecbd8a3 Merge remote-tracking branch 'origin/4.18'
omit 5347d067b44 scaleio: fix build error after 4.18 merge forward (#7669)
omit 09a4a252d7c Merge remote-tracking branch 'apache/4.18' into HEAD
omit 071a071434d backgroundColor of user-menu-avatar was hardcoded to
primary color value instead of accessing it from @primary-color in config.json
file. Updated the code to access the primary color from config.json (#7532)
omit e26d49de4da agent: remove powermock from tests (#7637)
omit 27b0a64b400 Fix scaleio tests (#7622)
omit 5fa9b8f6834 cks: enable by default (#7509)
omit 5fda9c36873 Upgrade mockito (#7577)
omit ae10263b3b3 Possibility to choose the source NAT IP address on a
isolated network or VPC (#6442)
omit 41e8ad74875 api,server,ui: vr,systemvm in public ip response (#7403)
omit c00a1ba532e Merge remote-tracking branch 'apache/4.18' into main
omit 9cb561e03be Remove excessive logs in LogUtils (#7228)
omit d93fe913642 [UI] Use CPU frequency of unconstrained offerings when
importing VMs from vCenter (#7222)
omit c944727d338 server: fix apache/4.18 merge failure
omit 6ea5f56e626 Merge remote-tracking branch 'apache/4.18' into main
omit 841fd725601 engine-schema: fix schema change for #6960 (#7579)
omit f905f5f39a9 Merge remote-tracking branch 'apache/4.18' into main
omit 8d6241fb1bf Enable two more `flake8` rules (#7552)
omit 2457d202ddf Fix acquire console session issue (#7558)
omit 0c13024329e refactor: remove duplicate inject (#7548)
omit ce44ff41486 Merge remote-tracking branch 'origin/4.18'
omit 47af4327455 Merge remote-tracking branch 'origin/4.18'
omit 48af4625a22 Fix end of file precommit for TemplateServiceImplTest.java
(#7561)
omit 8ff0071becf ui,api: make description option for
createKubernetesCluster (#7541)
omit b0d7a20d5d2 CONTRIBUTING.md: remove unneeded whitespace from start of
code blocks (#7553)
omit 0024cb03721 Merge branch '4.18'
omit 43a5d6260f0 Enable CPU cap in VRs (#7234)
omit c9b103c8a71 agent: Update DhcpProtocolParserServer.java (#7488)
omit 3e8c0684ed5 Prometheus: Ensure tagged hosts maintenance status is
reported consistently (#7471)
omit 257c0929cfa Modified the link in readme file (#7329)
omit 11d45654a6b misc: fix spelling (#7206)
omit 1bd47d38cbc .asf.yaml: fix typo
omit 9c690280a33 .asf.yaml: update repo labels
omit 2f309b573bc Merge remote-tracking branch 'origin/4.18'
omit 62fa45aa819 Merge remote-tracking branch 'origin/4.18'
omit 9ddfeac57e8 .asf.yaml: Added soreana to the .asf.yml (#7518)
omit 232c86a715a Merge remote-tracking branch 'origin/4.18'
omit 0af56179a59 Merge remote-tracking branch 'origin/4.18'
omit 2dc8b742c96 .asf.yaml: dummy commit to re-inforce asf.yaml config to
kickin
omit 45928d2d9f5 vim-oops
omit 216c5653081 replace pull_request_target with pull_request
omit 35862d45323 no write for external forks
omit 9d46df57f2c kvm: add vm setting for nic multiqueue number and packed
virtqueues (#7333)
omit 4243afbf04b .asf: grant triaging role access to frequent contributors
omit a2561df25b5 Merge remote-tracking branch 'origin/4.18'
omit e234c3ccdc7 server: guard vm start inter-cluster migration with config
(#7401)
omit b280370a983 Few UI fixes and details improvements (#7434)
omit 8b5bfb145e3 create parameter to determine whether roles are public or
private (#6960)
omit 957c0a5193a Hide option to upload volume when user does not have
permission (#7427)
omit 8e7c1f7bd7b schema: acquired for console_session turned into datetime
(#7414)
omit 575ffc6acc1 Merge remote-tracking branch 'apache/4.18' into main
omit 80c999cc81e GitHub Workflows security hardening (#6762)
omit 0ed49508961 server: allow updating project name (#7149)
omit 2ac1b7e9599 ui: Fix Management server comments PR 7379 UI issue (#7450)
omit e035d736413 Merge remote-tracking branch 'apache/4.18' into main
omit 69be0af32d3 Allow admin/users to add comments to Management Servers
(#7379)
omit 514df7b3a05 Merge release branch 4.18 to main
omit b866e40d17e Don't allow users to remove their account or user. (#7242)
omit 2fc879d5f15 Merge remote-tracking branch 'apache/4.18' into main
omit dddaeb75932 Fix shutdown header to match antdv design (#7429)
omit fdc0f4fcb39 Merge remote-tracking branch 'apache/4.18' into main
omit 8a42ab9ce41 Merge remote-tracking branch 'origin/4.18'
omit 941cc83372f Feature: Safely shutdown cloudstack (#6755)
omit 62b332e0ded api, ui: listing archived events (#7396)
omit 59a2b3137e5 Merge remote-tracking branch 'apache/4.18' into main
omit 6672c13254c Merge remote-tracking branch 'apache/4.18' into main
omit 3c25a354265 ui: AntD3 upgrade (#7306)
omit e6f737fdf9a Merge remote-tracking branch 'apache/4.18' into main
omit 9abf5cf5df2 Merge branch '4.18'
omit b7bd996300c Merge release branch 4.18 to main
omit 723ace8b784 Make DisplayText Non-Mandatory for Various Forms. (#7180)
omit 52fa31b446d Merge remote-tracking branch 'origin/4.18'
omit 0d6674e3b3d Merge remote-tracking branch 'origin/4.18'
omit be66eb2a35b Auto Enable/Disable KVM hosts (#7170)
omit 82a6a1f6c42 Merge remote-tracking branch 'apache/4.18' into main
omit 4116323de34 Updated wrong doc parameters in UserVmService. (#7321)
omit 1e253401b0c [Veeam] Block operations in restoring VMs (#7238)
omit 57ff125f83d add button to copy a VM console URL (#7351)
omit f5873402441 Merge remote-tracking branch 'apache/4.18' into main
omit f597b8fd455 Merge remote-tracking branch 'origin/4.18'
omit 3dfbb408acb Merge release branch 4.18 to main
omit c2cffcc5a94 Merge release branch 4.18 to main
omit c2e17310d61 Add three more `pre-commit` checks (#7083)
omit 1d0762e43a8 Merge release branch 4.18 to main
omit 9ca5f287eb4 Support Jetty's live cert reload on HTTPS frontend (#7355)
omit 2aa3f980e8f Fix schema path for 419 upgrade path (#7346)
omit ccbb0cfc545 Merge remote-tracking branch 'origin/main'
omit 1d2e3fe24d3 Merge remote-tracking branch 'origin/4.18'
omit 9f7a7ad66c5 checkstyle not updated
omit fb4f6a334d7 Updating pom.xml version numbers for release
4.19.0.0-SNAPSHOT
add 4bdff06acd3 Updating pom.xml version numbers for release 4.18.1.0
add 246bb24b0fc Updating pom.xml version numbers for release
4.18.2.0-SNAPSHOT
add b8c8e17318c upgrade: fix debian/changelog
add 9158057d60d VR live patching: Allow live patch of VPC VRs even if
networks are in allocated / shutdown state
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 (4a125fee708)
\
N -- N -- N refs/heads/patch-vpc-with-non-implemented-nws
(9158057d60d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 12 +-
.github/linters/.flake8 | 4 +-
.github/workflows/ci.yml | 30 +-
.github/workflows/codecov.yml | 3 -
.github/workflows/linter.yml | 19 +
.github/workflows/main-sonar-check.yml | 4 -
.github/workflows/sonar-check.yml | 3 +-
.github/workflows/ui.yml | 9 -
.pre-commit-config.yaml | 33 +-
CHANGES.md | 2 +-
CONTRIBUTING.md | 10 +-
LICENSE | 1 +
README.md | 6 +-
agent/conf/agent.properties | 4 -
agent/pom.xml | 2 +-
.../cloud/agent/dhcp/DhcpProtocolParserServer.java | 1 +
.../cloud/agent/properties/AgentProperties.java | 3 -
.../test/java/com/cloud/agent/AgentShellTest.java | 103 +-
.../properties/AgentPropertiesFileHandlerTest.java | 70 +-
.../org.mockito.plugins.MockMaker | 1 -
api/pom.xml | 2 +-
.../java/com/cloud/configuration/Resource.java | 47 +-
api/src/main/java/com/cloud/event/EventTypes.java | 24 -
.../main/java/com/cloud/hypervisor/Hypervisor.java | 18 +-
.../java/com/cloud/hypervisor/HypervisorGuru.java | 5 -
api/src/main/java/com/cloud/network/Network.java | 2 +-
.../java/com/cloud/network/vpc/VpcService.java | 132 +-
.../java/com/cloud/projects/ProjectService.java | 4 +-
.../java/com/cloud/resource/ResourceService.java | 2 -
.../java/com/cloud/server/ManagementService.java | 7 -
api/src/main/java/com/cloud/storage/Volume.java | 13 +-
.../java/com/cloud/storage/VolumeApiService.java | 3 -
api/src/main/java/com/cloud/vm/UserVmService.java | 30 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 11 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 4 -
.../main/java/org/apache/cloudstack/acl/Role.java | 1 -
.../org/apache/cloudstack/acl/RoleService.java | 10 +-
.../cloudstack/annotation/AnnotationService.java | 3 +-
.../cloudstack/api/AbstractGetUploadParamsCmd.java | 10 +-
.../cloudstack/api/ApiCommandResourceType.java | 3 +-
.../org/apache/cloudstack/api/ApiConstants.java | 20 -
.../api/BaseListRetrieveOnlyResourceCountCmd.java | 28 -
.../apache/cloudstack/api/ResponseGenerator.java | 3 -
.../api/command/admin/acl/CreateRoleCmd.java | 11 +-
.../api/command/admin/acl/ImportRoleCmd.java | 10 +-
.../api/command/admin/acl/ListRolesCmd.java | 3 +-
.../cloudstack/api/command/admin/acl/RoleCmd.java | 1 -
.../api/command/admin/acl/UpdateRoleCmd.java | 9 +-
.../api/command/admin/guest/AddGuestOsCmd.java | 3 +-
.../command/admin/guest/AddGuestOsMappingCmd.java | 17 +-
.../admin/guest/GetHypervisorGuestOsNamesCmd.java | 106 -
.../command/admin/guest/ListGuestOsMappingCmd.java | 14 -
.../api/command/admin/guest/UpdateGuestOsCmd.java | 5 +-
.../admin/guest/UpdateGuestOsMappingCmd.java | 8 -
.../api/command/admin/host/UpdateHostCmd.java | 4 +
.../admin/network/CreateNetworkOfferingCmd.java | 5 +-
.../admin/offering/CreateDiskOfferingCmd.java | 5 +-
.../admin/offering/CreateServiceOfferingCmd.java | 7 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 40 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 5 +-
.../user/address/ListPublicIpAddressesCmd.java | 23 +-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 2 +-
.../command/user/config/ListCapabilitiesCmd.java | 1 -
.../api/command/user/event/ListEventsCmd.java | 7 -
.../command/user/iso/GetUploadParamsForIsoCmd.java | 21 +-
.../api/command/user/iso/RegisterIsoCmd.java | 6 +-
.../api/command/user/job/ListAsyncJobsCmd.java | 8 -
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 2 +-
.../api/command/user/network/CreateNetworkCmd.java | 16 +-
.../api/command/user/network/ListNetworksCmd.java | 37 +-
.../api/command/user/network/UpdateNetworkCmd.java | 7 -
.../api/command/user/project/CreateProjectCmd.java | 5 +-
.../api/command/user/project/UpdateProjectCmd.java | 13 +-
.../command/user/template/CreateTemplateCmd.java | 6 +-
.../command/user/template/RegisterTemplateCmd.java | 15 +-
.../api/command/user/vm/CreateVMScheduleCmd.java | 152 -
.../api/command/user/vm/DeleteVMScheduleCmd.java | 112 -
.../api/command/user/vm/DeployVMCmd.java | 16 -
.../api/command/user/vm/ListVMScheduleCmd.java | 97 -
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 13 +-
.../api/command/user/vm/UpdateVMScheduleCmd.java | 139 -
.../api/command/user/volume/ListVolumesCmd.java | 11 +-
.../api/command/user/vpc/CreateVPCCmd.java | 24 +-
.../api/command/user/vpc/ListVPCsCmd.java | 4 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 35 +-
.../cloudstack/api/response/AsyncJobResponse.java | 34 +-
.../cloudstack/api/response/BackupResponse.java | 10 +-
.../api/response/BackupRestorePointResponse.java | 10 +-
.../cloudstack/api/response/BaseRoleResponse.java | 9 -
.../api/response/CapabilitiesResponse.java | 8 -
.../cloudstack/api/response/EventResponse.java | 8 -
.../cloudstack/api/response/GuestOSResponse.java | 34 +-
.../api/response/HostForMigrationResponse.java | 5 +-
.../cloudstack/api/response/HostResponse.java | 7 +-
.../response/HypervisorCapabilitiesResponse.java | 7 +-
.../response/HypervisorGuestOsNamesResponse.java | 76 -
.../api/response/HypervisorGuestOsResponse.java | 51 -
.../cloudstack/api/response/IPAddressResponse.java | 23 +-
.../api/response/VMScheduleResponse.java | 109 -
.../api/response/VMSnapshotResponse.java | 7 +-
.../java/org/apache/cloudstack/backup/Backup.java | 14 +-
.../management/ManagementServerHost.java | 5 +-
.../cloudstack/userdata/UserDataManager.java | 27 -
.../apache/cloudstack/vm/schedule/VMSchedule.java | 51 -
.../cloudstack/vm/schedule/VMScheduleManager.java | 40 -
.../cloudstack/vm/schedule/VMScheduledJob.java | 38 -
.../cloudstack/api-planner/module.properties | 2 +-
.../admin/offering/CreateDiskOfferingCmdTest.java | 37 -
.../offering/CreateNetworkOfferingCmdTest.java | 37 -
.../offering/CreateServiceOfferingCmdTest.java | 40 -
.../vm/MigrateVirtualMachineWithVolumeCmdTest.java | 93 +-
.../admin/vpc/CreateVPCOfferingCmdTest.java | 10 -
.../api/command/test/CreateRoleCmdTest.java | 4 +-
.../api/command/test/ImportRoleCmdTest.java | 2 +-
.../api/command/test/UpdateRoleCmdTest.java | 2 +-
.../api/command/user/iso/RegisterIsoCmdTest.java | 40 -
.../command/user/project/CreateProjectCmdTest.java | 40 -
.../user/template/RegisterTemplateCmdTest.java | 10 -
.../command/user/vm/CreateVMScheduleCmdTest.java | 96 -
.../command/user/vm/DeleteVMScheduleCmdTest.java | 115 -
.../api/command/user/vm/ListVMScheduleCmdTest.java | 92 -
.../command/user/vm/UpdateVMScheduleCmdTest.java | 102 -
.../api/command/user/vpc/CreateVPCCmdTest.java | 6 -
.../api/command/user/vpc/UpdateVPCCmdTest.java | 8 +-
client/pom.xml | 17 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 9 -
core/pom.xml | 2 +-
.../cloud/agent/api/CheckGuestOsMappingAnswer.java | 38 -
.../agent/api/CheckGuestOsMappingCommand.java | 65 -
.../agent/api/GetHypervisorGuestOsNamesAnswer.java | 58 -
.../api/GetHypervisorGuestOsNamesCommand.java | 53 -
.../com/cloud/agent/api/PingRoutingCommand.java | 9 -
.../com/cloud/agent/api/StartupRoutingCommand.java | 9 -
.../allocator/spring-core-allocator-context.xml | 2 +-
...ore-lifecycle-allocator-context-inheritable.xml | 2 +-
.../cloudstack/direct-download/module.properties | 2 +-
...ing-core-lifecycle-core-context-inheritable.xml | 9 +-
.../core/spring-core-registry-core-context.xml | 4 -
.../cloudstack/kubernetes/module.properties | 2 +-
.../META-INF/cloudstack/planner/module.properties | 2 +-
.../api/GetHypervisorGuestOsNamesAnswerTest.java | 66 -
.../api/GetHypervisorGuestOsNamesCommandTest.java | 40 -
.../agent/test/CheckGuestOsMappingAnswerTest.java | 66 -
.../agent/test/CheckGuestOsMappingCommandTest.java | 46 -
debian/changelog | 12 +-
debian/cloudstack-cli.install | 2 +-
debian/cloudstack-common.postinst | 2 +-
debian/cloudstack-docs.install | 2 +-
debian/rules | 2 +-
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
engine/components-api/pom.xml | 2 +-
.../main/java/com/cloud/agent/AgentManager.java | 7 -
.../cloud/configuration/ConfigurationManager.java | 5 -
.../java/com/cloud/network/IpAddressManager.java | 2 -
engine/network/pom.xml | 2 +-
engine/orchestration/pom.xml | 7 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 53 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 43 +-
.../engine/orchestration/NetworkOrchestrator.java | 6 +-
engine/pom.xml | 4 +-
engine/schema/pom.xml | 2 +-
.../configuration/dao/ResourceCountDaoImpl.java | 15 +
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 -
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 18 -
.../network/dao/ExternalFirewallDeviceDao.java | 6 +-
.../network/dao/ExternalLoadBalancerDeviceDao.java | 8 +-
.../com/cloud/network/dao/FirewallRulesDao.java | 6 -
.../java/com/cloud/network/dao/IPAddressDao.java | 4 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 6 +-
.../com/cloud/storage/GuestOSHypervisorVO.java | 3 +-
.../java/com/cloud/storage/dao/GuestOSDao.java | 1 -
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 20 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 -
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41810to41900.java | 196 -
.../main/java/com/cloud/vm/ConsoleSessionVO.java | 12 +-
.../schema/src/main/java/com/cloud/vm/NicVO.java | 12 -
.../java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 4 +-
.../com/cloud/vm/dao/ConsoleSessionDaoImpl.java | 10 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 -
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 8 -
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 1 -
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 16 -
.../java/org/apache/cloudstack/acl/RoleVO.java | 11 -
.../org/apache/cloudstack/acl/dao/RoleDao.java | 14 +-
.../org/apache/cloudstack/acl/dao/RoleDaoImpl.java | 41 +-
.../org/apache/cloudstack/backup/BackupVO.java | 12 +-
.../cloudstack/vm/schedule/VMScheduleVO.java | 183 -
.../cloudstack/vm/schedule/VMScheduledJobVO.java | 113 -
.../cloudstack/vm/schedule/dao/VMScheduleDao.java | 37 -
.../vm/schedule/dao/VMScheduleDaoImpl.java | 108 -
.../vm/schedule/dao/VMScheduledJobDao.java | 34 -
.../vm/schedule/dao/VMScheduledJobDaoImpl.java | 95 -
.../spring-engine-schema-core-daos-context.xml | 2 -
.../main/resources/META-INF/db/data-217to218.sql | 1 +
.../main/resources/META-INF/db/schema-20to21.sql | 1 +
.../META-INF/db/schema-21to22-cleanup.sql | 2 +
.../META-INF/db/schema-21to22-premium.sql | 3 +
.../main/resources/META-INF/db/schema-21to22.sql | 1 +
.../resources/META-INF/db/schema-2210to2211.sql | 1 +
.../resources/META-INF/db/schema-2211to2212.sql | 1 +
.../resources/META-INF/db/schema-2212to2213.sql | 1 +
.../resources/META-INF/db/schema-2213to2214.sql | 1 +
.../META-INF/db/schema-2214to30-cleanup.sql | 1 +
.../META-INF/db/schema-221to222-cleanup.sql | 1 +
.../main/resources/META-INF/db/schema-221to222.sql | 2 +
.../META-INF/db/schema-222to224-premium.sql | 1 +
.../main/resources/META-INF/db/schema-222to224.sql | 1 +
.../main/resources/META-INF/db/schema-224to225.sql | 1 +
.../main/resources/META-INF/db/schema-225to226.sql | 1 +
.../META-INF/db/schema-227to228-premium.sql | 1 +
.../main/resources/META-INF/db/schema-227to228.sql | 2 +
.../main/resources/META-INF/db/schema-228to229.sql | 2 +
.../META-INF/db/schema-22beta3to22beta4.sql | 2 +
.../META-INF/db/schema-304to305-cleanup.sql | 1 +
.../META-INF/db/schema-305to306-cleanup.sql | 2 +-
.../main/resources/META-INF/db/schema-306to307.sql | 2 +-
.../META-INF/db/schema-307to410-cleanup.sql | 6 +
.../META-INF/db/schema-40to410-cleanup.sql | 1 +
.../main/resources/META-INF/db/schema-40to410.sql | 1 +
.../META-INF/db/schema-41000to41100-cleanup.sql | 2 +-
.../META-INF/db/schema-410to420-cleanup.sql | 2 +
.../resources/META-INF/db/schema-41110to41120.sql | 2 +-
.../META-INF/db/schema-41500to41510-cleanup.sql | 1 +
.../resources/META-INF/db/schema-41500to41510.sql | 1 +
.../META-INF/db/schema-41510to41520-cleanup.sql | 1 +
.../META-INF/db/schema-41600to41610-cleanup.sql | 2 +-
.../META-INF/db/schema-41610to41700-cleanup.sql | 2 +-
.../resources/META-INF/db/schema-41610to41700.sql | 2 +-
.../META-INF/db/schema-41700to41710-cleanup.sql | 2 +-
.../resources/META-INF/db/schema-41700to41710.sql | 2 +-
.../resources/META-INF/db/schema-41720to41800.sql | 2 +-
.../META-INF/db/schema-41810to41900-cleanup.sql | 20 -
.../resources/META-INF/db/schema-41810to41900.sql | 182 -
.../META-INF/db/schema-421to430-cleanup.sql | 1 +
.../main/resources/META-INF/db/schema-441to442.sql | 1 +
.../META-INF/db/schema-442to450-cleanup.sql | 2 +-
.../main/resources/META-INF/db/schema-442to450.sql | 2 +-
.../META-INF/db/schema-452to460-cleanup.sql | 1 +
.../main/resources/META-INF/db/schema-452to460.sql | 2 +
.../main/resources/META-INF/db/schema-461to470.sql | 1 +
.../main/resources/META-INF/db/schema-480to481.sql | 1 +
.../META-INF/db/schema-481to490-cleanup.sql | 1 +
.../META-INF/db/schema-490to4910-cleanup.sql | 1 +
.../META-INF/db/schema-4910to4920-cleanup.sql | 1 +
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
.../cache/manager/StorageCacheManagerImpl.java | 8 +-
engine/storage/configdrive/pom.xml | 2 +-
engine/storage/datamotion/pom.xml | 2 +-
engine/storage/image/pom.xml | 2 +-
engine/storage/integration-test/pom.xml | 2 +-
.../src/test/resources/component.xml | 5 -
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 6 +-
...spring-engine-storage-snapshot-core-context.xml | 2 +-
.../cloudstack/storage-allocator/module.properties | 2 +-
engine/storage/volume/pom.xml | 2 +-
.../spring-engine-storage-volume-core-context.xml | 2 +-
.../volume/src/test/resource/testContext.xml | 2 +-
engine/userdata/cloud-init/pom.xml | 36 -
.../userdata/CloudInitUserDataProvider.java | 286 --
.../core/spring-userdata-cloud-init-context.xml | 27 -
.../userdata/CloudInitUserDataProviderTest.java | 206 -
engine/userdata/pom.xml | 53 -
.../cloudstack/userdata/UserDataManagerImpl.java | 138 -
.../cloudstack/userdata/UserDataProvider.java | 28 -
.../core/spring-engine-userdata-core-context.xml | 34 -
.../userdata/UserDataManagerImplTest.java | 59 -
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
.../com/cloud/cluster/ManagementServerHostVO.java | 15 -
framework/config/pom.xml | 2 +-
framework/db/pom.xml | 2 +-
framework/db/src/test/resources/db.properties | 2 +-
framework/direct-download/pom.xml | 6 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
.../framework/messagebus/MessageDetector.java | 10 +-
.../core/spring-framework-ipc-core-context.xml | 2 +-
framework/jobs/pom.xml | 2 +-
.../apache/cloudstack/framework/jobs/AsyncJob.java | 2 -
.../cloudstack/framework/jobs/AsyncJobManager.java | 14 +-
.../cloudstack/framework/jobs/dao/AsyncJobDao.java | 4 -
.../framework/jobs/dao/AsyncJobDaoImpl.java | 20 -
.../framework/jobs/impl/AsyncJobManagerImpl.java | 45 +-
.../cloudstack/framework/jobs/impl/AsyncJobVO.java | 1 -
framework/jobs/src/test/resources/log4j.properties | 1 +
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../cloudstack/quota/QuotaAlertManagerImpl.java | 22 +-
.../cloudstack/quota/constant/QuotaConfig.java | 6 -
.../quota/QuotaAlertManagerImplTest.java | 29 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
.../testfiles/all/test2-defaults.properties | 1 +
.../testfiles/missingname/module.properties | 1 +
.../testhierarchy/excluded/module.properties | 2 +-
.../testhierarchy/excluded2/module.properties | 2 +-
.../orphan-of-excluded/defaults.properties | 2 +-
.../orphan-of-excluded/module.properties | 2 +-
packaging/README.md | 4 +-
packaging/centos7/cloud-ipallocator.rc | 1 +
packaging/centos7/cloud.spec | 3 +-
packaging/centos8/cloud-ipallocator.rc | 1 +
packaging/centos8/cloud.spec | 2 +-
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/project-role-based/pom.xml | 2 +-
.../acl-project-role-based/module.properties | 2 +-
.../acl/ProjectRoleBasedApiAccessCheckerTest.java | 30 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/acl/static-role-based/pom.xml | 2 +-
.../acl-static-role-based/module.properties | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../explicit-dedication/module.properties | 2 +-
.../host-affinity/pom.xml | 2 +-
.../cloudstack/host-affinity/module.properties | 2 +-
.../host-affinity/spring-host-affinity-context.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
.../host-anti-affinity/module.properties | 2 +-
.../non-strict-host-affinity/pom.xml | 2 +-
.../non-strict-host-anti-affinity/pom.xml | 4 +-
.../NonStrictHostAntiAffinityProcessorTest.java | 4 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
.../cloudstack/rate-limit/module.properties | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
.../solidfire-intg-test/module.properties | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
.../cloudstack/vmware-sioc/module.properties | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
.../cloudstack/backup/DummyBackupProvider.java | 2 +-
plugins/backup/networker/pom.xml | 2 +-
.../cloudstack/backup/NetworkerBackupProvider.java | 11 +-
.../backup/networker/NetworkerClient.java | 10 +-
.../cloudstack/networker/module.properties | 2 +-
.../networker/spring-backup-networker-context.xml | 1 +
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/veeam/VeeamClient.java | 10 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 3 +-
.../api/response/QuotaResponseBuilderImplTest.java | 21 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/dedicated-resources/pom.xml | 2 +-
.../implicit-dedication/pom.xml | 2 +-
.../implicit-dedication/module.properties | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../user-concentrated-pod/module.properties | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
.../spring-skip-heurestics-context.xml | 1 +
plugins/host-allocators/random/pom.xml | 2 +-
.../host-allocator-random/module.properties | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../cloudstack/baremetal-compute/module.properties | 2 +-
.../baremetal-discoverer/module.properties | 2 +-
.../cloudstack/baremetal-network/module.properties | 2 +-
.../cloudstack/baremetal-planner/module.properties | 2 +-
.../cloudstack/baremetal-storage/module.properties | 2 +-
.../hyperv/DotNet/ServerResource/.gitignore | 1 +
.../ServerResource/AgentShell/AgentShell.csproj | 2 +-
.../DotNet/ServerResource/AgentShell/App.config | 2 +-
.../ServerResource/AgentShell/packages.config | 2 +-
.../HypervResource/HypervResource.csproj | 2 +-
.../ServerResource/HypervResource/heartbeat.bat | 2 +-
.../ServerResource/HypervResource/packages.config | 2 +-
.../ServerResource/ServerResource.Tests/App.config | 2 +-
.../ServerResource.Tests/packages.config | 2 +-
.../ServerResource/WmiWrappers/WmiWrappers.csproj | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
.../cloudstack/hyperv-compute/module.properties | 2 +-
.../cloudstack/hyperv-discoverer/module.properties | 2 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 98 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 9 -
.../hypervisor/kvm/resource/LibvirtVMDef.java | 27 -
.../wrapper/LibvirtPlugNicCommandWrapper.java | 3 -
.../LibvirtPrepareForMigrationCommandWrapper.java | 3 -
.../wrapper/LibvirtReplugNicCommandWrapper.java | 4 +-
.../cloudstack/kvm-compute/module.properties | 2 +-
.../cloud/hypervisor/kvm/dpdk/DpdkDriverTest.java | 24 +-
.../kvm/resource/BridgeVifDriverTest.java | 3 -
.../kvm/resource/LibvirtComputingResourceTest.java | 421 +-
.../kvm/resource/LibvirtDomainXMLParserTest.java | 5 -
.../kvm/resource/LibvirtKvmAgentHookTest.java | 19 +-
.../kvm/resource/LibvirtSecretDefTest.java | 6 -
.../kvm/resource/LibvirtStoragePoolDefTest.java | 7 -
.../resource/LibvirtStoragePoolXMLParserTest.java | 7 -
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 69 +-
.../kvm/resource/LibvirtVifDriverTest.java | 91 +-
...bvirtGetAutoScaleMetricsCommandWrapperTest.java | 14 +-
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 57 +-
.../LibvirtNetworkElementCommandWrapperTest.java | 13 +-
.../LibvirtReplugNicCommandWrapperTest.java | 42 +-
.../LibvirtRevertSnapshotCommandWrapperTest.java | 82 +-
.../wrapper/LibvirtScaleVmCommandWrapperTest.java | 57 +-
.../wrapper/LibvirtUtilitiesHelperTest.java | 4 +-
.../kvm/storage/KVMPhysicalDiskTest.java | 9 -
.../kvm/storage/KVMStorageProcessorTest.java | 210 +-
.../kvm/storage/LibvirtStoragePoolTest.java | 7 -
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 3 -
.../kvm/storage/ScaleIOStoragePoolTest.java | 85 +-
.../kvm/storage/ScaleIOStoragePoolTest.java.bkp | 202 -
.../apache/cloudstack/kvm/ha/KVMHostHATest.java | 2 +
.../utils/cryptsetup/CryptSetupTest.java | 4 -
.../cloudstack/utils/cryptsetup/KeyFileTest.java | 3 -
.../cloudstack/utils/linux/KVMHostInfoTest.java | 40 +-
.../apache/cloudstack/utils/linux/MemStatTest.java | 33 +-
.../cloudstack/utils/qemu/QemuImgFileTest.java | 6 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/hypervisors/ovm/pom.xml | 2 +-
.../cloudstack/ovm-compute/module.properties | 2 +-
.../cloudstack/ovm-discoverer/module.properties | 2 +-
.../main/scripts/vm/hypervisor/ovm/configureOvm.sh | 1 +
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
.../cloudstack/simulator-compute/module.properties | 2 +-
.../simulator-discoverer/module.properties | 2 +-
.../cloudstack/simulator-storage/module.properties | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 17 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 4 +-
.../hypervisor/vmware/resource/VmwareResource.java | 63 -
.../cloudstack/core/spring-vmware-core-context.xml | 2 +-
.../cloudstack/vmware-compute/module.properties | 2 +-
.../cloudstack/vmware-discoverer/module.properties | 2 +-
.../cloudstack/vmware-network/module.properties | 2 +-
.../spring-vmware-network-context.xml | 2 +-
.../cloudstack/vmware-storage/module.properties | 2 +-
.../com/cloud/hypervisor/guru/VMwareGuruTest.java | 17 +-
.../hypervisor/guru/VmwareVmImplementerTest.java | 17 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 24 +-
.../vmware/manager/VmwareManagerImplTest.java | 6 +-
.../vmware/resource/VmwareResourceTest.java | 162 +-
.../motion/VmwareStorageMotionStrategyTest.java | 4 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../CitrixCheckGuestOsMappingCommandWrapper.java | 67 -
...rixGetHypervisorGuestOsNamesCommandWrapper.java | 76 -
.../cloudstack/xenserver-compute/module.properties | 2 +-
.../xenserver-discoverer/module.properties | 2 +-
.../xenserver/resource/CitrixResourceBaseTest.java | 62 +-
.../xenserver/resource/XcpOssResourceTest.java | 2 +-
.../xenserver/resource/XcpServerResourceTest.java | 4 +-
.../resource/XenServer56FP1ResourceTest.java | 2 +-
.../resource/XenServer56ResourceTest.java | 2 +-
.../resource/XenServer56SP2ResourceTest.java | 2 +-
.../resource/XenServer600ResourceTest.java | 2 +-
.../resource/XenServer625ResourceTest.java | 2 +-
.../resource/XenServer650ResourceTest.java | 2 +-
.../resource/Xenserver625StorageProcessorTest.java | 157 +-
.../wrapper/xenbase/CitrixRequestWrapperTest.java | 68 +-
.../wrapper/xenbase/XcpServerWrapperTest.java | 6 +-
.../wrapper/xenbase/XenServer56FP1WrapperTest.java | 4 +-
.../wrapper/xenbase/XenServer56WrapperTest.java | 8 +-
.../wrapper/xenbase/XenServer610WrapperTest.java | 50 +-
.../xenbase/XenServer620SP1WrapperTest.java | 4 +-
.../wrapper/xenbase/XenServer620WrapperTest.java | 4 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../kubernetes/cluster/KubernetesCluster.java | 13 +-
.../cluster/KubernetesClusterManagerImpl.java | 414 +-
.../cluster/KubernetesClusterService.java | 23 +-
.../kubernetes/cluster/KubernetesClusterVO.java | 38 +-
.../cluster/dao/KubernetesClusterDao.java | 2 +-
.../cluster/dao/KubernetesClusterDaoImpl.java | 16 +-
.../cluster/dao/KubernetesClusterVmMapDao.java | 4 -
.../cluster/dao/KubernetesClusterVmMapDaoImpl.java | 15 -
.../AddVirtualMachinesToKubernetesClusterCmd.java | 106 -
.../cluster/CreateKubernetesClusterCmd.java | 39 +-
.../cluster/DeleteKubernetesClusterCmd.java | 22 +-
.../cluster/ListKubernetesClustersCmd.java | 8 -
...oveVirtualMachinesFromKubernetesClusterCmd.java | 103 -
.../cluster/ScaleKubernetesClusterCmd.java | 2 +-
.../cluster/StartKubernetesClusterCmd.java | 6 +-
.../cluster/StopKubernetesClusterCmd.java | 4 +-
.../cluster/UpgradeKubernetesClusterCmd.java | 2 +-
.../api/response/KubernetesClusterResponse.java | 12 -
...rtualMachinesFromKubernetesClusterResponse.java | 34 -
.../cluster/KubernetesClusterManagerImplTest.java | 140 +-
.../cluster/utils/KubernetesClusterUtilTest.java | 35 +-
.../version/KubernetesVersionServiceTest.java | 66 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/integrations/prometheus/pom.xml | 2 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 4 +-
plugins/metrics/pom.xml | 2 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 12 +-
.../cloudstack/response/HostMetricsResponse.java | 14 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
.../META-INF/cloudstack/vcs/module.properties | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
.../cloudstack/cisco-vnmc/module.properties | 2 +-
.../scripts/network/cisco/create-acl-policy.xml | 2 +-
.../main/scripts/network/cisco/create-ip-pool.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../src/main/resources/components-example.xml | 1 -
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
.../META-INF/cloudstack/elb/module.properties | 2 +-
.../lb/ElasticLoadBalancerManagerImplTest.java | 6 +-
.../network/lb/LoadBalanceRuleHandlerTest.java | 12 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/network-elements/globodns/pom.xml | 2 +-
.../META-INF/cloudstack/globodns/module.properties | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../META-INF/cloudstack/contrail/module.properties | 2 +-
.../src/test/resources/log4j.properties | 1 +
.../src/test/resources/mysql_db_stop.sh | 2 +
.../src/test/resources/providerContext.xml | 2 +-
.../src/test/resources/publicNetworkContext.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
.../cloudstack/netscaler/module.properties | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
.../com/cloud/network/nicira/NiciraRestClient.java | 2 +-
.../META-INF/cloudstack/nvp/module.properties | 2 +-
.../cloud/network/nicira/NiciraRestClientTest.java | 26 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/network-elements/opendaylight/pom.xml | 2 +-
.../opendaylight/spring-opendaylight-context.xml | 1 +
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
.../META-INF/cloudstack/paloalto/module.properties | 2 +-
.../paloalto/spring-paloalto-context.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
.../META-INF/cloudstack/ssp/module.properties | 2 +-
plugins/network-elements/tungsten/pom.xml | 4 +-
.../META-INF/cloudstack/tungsten/module.properties | 2 +-
...FabricNetworkGatewayToLogicalRouterCmdTest.java | 21 +-
.../AddTungstenFabricPolicyRuleCmdTest.java | 43 +-
.../command/ApplyTungstenFabricPolicyCmdTest.java | 25 +-
.../api/command/ApplyTungstenFabricTagCmdTest.java | 29 +-
.../ConfigTungstenFabricServiceCmdTest.java | 38 +-
.../CreateTungstenFabricAddressGroupCmdTest.java | 23 +-
...eTungstenFabricApplicationPolicySetCmdTest.java | 19 +-
.../CreateTungstenFabricFirewallPolicyCmdTest.java | 23 +-
.../CreateTungstenFabricFirewallRuleCmdTest.java | 41 +-
.../CreateTungstenFabricLogicalRouterCmdTest.java | 19 +-
...eateTungstenFabricManagementNetworkCmdTest.java | 25 +-
.../command/CreateTungstenFabricPolicyCmdTest.java | 19 +-
.../CreateTungstenFabricProviderCmdTest.java | 29 +-
.../CreateTungstenFabricPublicNetworkCmdTest.java | 25 +-
.../CreateTungstenFabricServiceGroupCmdTest.java | 25 +-
.../command/CreateTungstenFabricTagCmdTest.java | 21 +-
.../CreateTungstenFabricTagTypeCmdTest.java | 19 +-
.../DeleteTungstenFabricAddressGroupCmdTest.java | 26 +-
...eTungstenFabricApplicationPolicySetCmdTest.java | 27 +-
.../DeleteTungstenFabricFirewallPolicyCmdTest.java | 27 +-
.../DeleteTungstenFabricFirewallRuleCmdTest.java | 27 +-
.../DeleteTungstenFabricLogicalRouterCmdTest.java | 27 +-
.../command/DeleteTungstenFabricPolicyCmdTest.java | 27 +-
.../DeleteTungstenFabricServiceGroupCmdTest.java | 27 +-
.../command/DeleteTungstenFabricTagCmdTest.java | 24 +-
.../DeleteTungstenFabricTagTypeCmdTest.java | 26 +-
.../GetLoadBalancerSslCertificateCmdTest.java | 39 +-
.../ListTungstenFabricAddressGroupCmdTest.java | 47 +-
...tTungstenFabricApplictionPolicySetCmdTest.java} | 50 +-
.../ListTungstenFabricFirewallPolicyCmdTest.java | 49 +-
.../ListTungstenFabricFirewallRuleCmdTest.java | 49 +-
.../ListTungstenFabricLBHealthMonitorCmdTest.java | 39 +-
.../ListTungstenFabricLogicalRouterCmdTest.java | 49 +-
.../command/ListTungstenFabricNetworkCmdTest.java | 53 +-
.../api/command/ListTungstenFabricNicCmdTest.java | 49 +-
.../command/ListTungstenFabricPolicyCmdTest.java | 50 +-
.../ListTungstenFabricPolicyRuleCmdTest.java | 51 +-
.../ListTungstenFabricProvidersCmdTest.java | 40 +-
.../ListTungstenFabricServiceGroupCmdTest.java | 48 +-
.../api/command/ListTungstenFabricTagCmdTest.java | 58 +-
.../command/ListTungstenFabricTagTypeCmdTest.java | 47 +-
.../api/command/ListTungstenFabricVmCmdTest.java | 47 +-
...bricNetworkGatewayFromLogicalRouterCmdTest.java | 21 +-
.../command/RemoveTungstenFabricPolicyCmdTest.java | 21 +-
.../RemoveTungstenFabricPolicyRuleCmdTest.java | 21 +-
.../command/RemoveTungstenFabricTagCmdTest.java | 27 +-
.../SynchronizeTungstenFabricDataCmdTest.java | 25 +-
...UpdateTungstenFabricLBHealthMonitorCmdTest.java | 60 +-
.../tungsten/resource/TungstenResourceTest.java | 55 +-
.../network/tungsten/service/TungstenApiTest.java | 3 -
.../tungsten/service/TungstenElementTest.java | 61 +-
.../tungsten/service/TungstenFabricUtilsTest.java | 14 +-
.../service/TungstenGuestNetworkGuruTest.java | 35 +-
.../service/TungstenIntrospectApiTest.java | 25 +-
.../service/TungstenProviderServiceTest.java | 15 +-
.../tungsten/service/TungstenServiceImplTest.java | 86 +-
.../tungsten/service/TungstenVRouterApiTest.java | 23 +-
.../vrouter/IntrospectApiConnectorImplTest.java | 40 +-
.../vrouter/VRouterApiConnectorImplTest.java | 64 +-
.../tungsten/src/test/resources/log4j.properties | 1 +
.../org.mockito.plugins.MockMaker | 1 -
plugins/network-elements/vxlan/pom.xml | 2 +-
.../META-INF/cloudstack/vxlan/module.properties | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 4 +-
plugins/shutdown/pom.xml | 44 -
.../api/command/BaseShutdownActionCmd.java | 49 -
.../cloudstack/api/command/CancelShutdownCmd.java | 62 -
.../api/command/PrepareForShutdownCmd.java | 61 -
.../api/command/ReadyForShutdownCmd.java | 80 -
.../cloudstack/api/command/TriggerShutdownCmd.java | 64 -
.../api/response/ReadyForShutdownResponse.java | 81 -
.../cloudstack/shutdown/ShutdownManager.java | 60 -
.../cloudstack/shutdown/ShutdownManagerImpl.java | 265 --
.../BaseShutdownManagementServerHostCommand.java | 38 -
.../CancelShutdownManagementServerHostCommand.java | 27 -
...pareForShutdownManagementServerHostCommand.java | 26 -
...TriggerShutdownManagementServerHostCommand.java | 26 -
.../META-INF/cloudstack/shutdown/module.properties | 18 -
.../shutdown/spring-shutdown-context.xml | 29 -
.../shutdown/ShutdownManagerImplTest.java | 78 -
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 5 +-
.../storage-image-default/module.properties | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
.../cloudstack/storage-image-s3/module.properties | 2 +-
plugins/storage/image/sample/pom.xml | 5 +-
plugins/storage/image/swift/pom.xml | 5 +-
.../storage-image-swift/module.properties | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 5 +-
.../storage-volume-cloudbyte/module.properties | 2 +-
plugins/storage/volume/datera/pom.xml | 5 +-
plugins/storage/volume/default/pom.xml | 5 +-
.../storage-volume-default/module.properties | 2 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 48 +-
plugins/storage/volume/linstor/pom.xml | 5 +-
plugins/storage/volume/nexenta/pom.xml | 5 +-
.../module.properties | 2 +-
.../spring-storage-volume-nexenta-context.xml | 2 +-
.../datastore/util/NexentaStorApplianceTest.java | 1 +
plugins/storage/volume/sample/pom.xml | 5 +-
plugins/storage/volume/scaleio/pom.xml | 5 +-
.../client/ScaleIOGatewayClientImplTest.java | 4 +-
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 35 +-
.../ScaleIOPrimaryDataStoreLifeCycleTest.java | 57 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../storage-volume-solidfire/module.properties | 2 +-
plugins/storage/volume/storpool/pom.xml | 5 +-
.../storage/datastore/util/StorPoolUtil.java | 7 +-
.../driver/StorPoolPrimaryDataStoreDriverTest.java | 4 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../META-INF/cloudstack/ldap/module.properties | 2 +-
.../org/apache/cloudstack/ldap/LdapUserSpec.groovy | 2 +-
.../NoLdapUserMatchingQueryExceptionSpec.groovy | 2 +-
.../api/command/LdapCreateAccountCmdTest.java | 4 +-
.../api/command/LdapImportUsersCmdTest.java | 4 +-
.../api/command/LdapListUsersCmdTest.java | 42 +-
.../api/command/LinkAccountToLdapCmdTest.java | 2 +-
.../api/command/LinkDomainToLdapCmdTest.java | 2 +-
.../ldap/src/test/resources/cloudstack.org.ldif | 1 +
.../ldap/src/test/resources/ldapunit.ldif | 2 +-
.../ldap/src/test/resources/minimal.ldif | 1 +
.../org.mockito.plugins.MockMaker | 1 -
.../ldap/src/test/resources/unboundid.ldif | 1 +
plugins/user-authenticators/md5/pom.xml | 2 +-
.../META-INF/cloudstack/md5/module.properties | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
.../cloudstack/plaintext/module.properties | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../cloudstack/sha256salted/module.properties | 2 +-
.../static-pin/pom.xml | 4 +-
.../cloudstack/staticpin/module.properties | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 4 +-
.../META-INF/cloudstack/totp/module.properties | 2 +-
pom.xml | 6 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 +
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 +
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 1 +
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 +
.../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 +
.../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 +
quickcloud/pom.xml | 2 +-
scripts/installer/export-templates.sh | 1 +
scripts/network/juniper/dest-nat-rule-getone.xml | 2 +
.../juniper/firewall-filter-bytes-getall.xml | 1 +
scripts/network/juniper/src-nat-rule-add.xml | 2 +
scripts/network/juniper/src-nat-rule-getall.xml | 1 +
scripts/network/juniper/src-nat-rule-getone.xml | 2 +
scripts/network/juniper/static-nat-rule-add.xml | 2 +
scripts/network/juniper/static-nat-rule-getall.xml | 2 +
scripts/network/juniper/static-nat-rule-getone.xml | 2 +
scripts/network/juniper/test.xml | 1 +
scripts/network/juniper/zone-interface-add.xml | 1 +
scripts/network/juniper/zone-interface-getone.xml | 1 +
scripts/storage/qcow2/managevolume.sh | 2 +
scripts/storage/secondary/setup-sysvm-tmplt | 2 +-
scripts/util/keystore-cert-import | 2 +-
scripts/vm/hypervisor/kvm/nsrkvmbackup.sh | 2 +-
scripts/vm/hypervisor/kvm/nsrkvmrestore.sh | 2 +-
.../xenserver/add_to_vcpus_params_live.sh | 1 +
.../vm/hypervisor/xenserver/cloud-plugin-storage | 1 +
.../hypervisor/xenserver/cloud-prepare-upgrade.sh | 1 +
.../vm/hypervisor/xenserver/cloud-setup-bonding.sh | 1 +
scripts/vm/hypervisor/xenserver/cloudlog | 1 +
scripts/vm/hypervisor/xenserver/make_migratable.sh | 2 +
scripts/vm/hypervisor/xenserver/network_info.sh | 1 +
scripts/vm/hypervisor/xenserver/ovstunnel | 2 +-
scripts/vm/hypervisor/xenserver/setup_iscsi.sh | 1 +
scripts/vm/hypervisor/xenserver/setupxenserver.sh | 1 +
.../vm/hypervisor/xenserver/upgrade_vnc_config.sh | 1 +
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 1 +
scripts/vm/hypervisor/xenserver/xcposs/patch | 2 +-
scripts/vm/hypervisor/xenserver/xcpserver/patch | 2 +-
scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
scripts/vm/hypervisor/xenserver/xenserver60/patch | 2 +-
scripts/vm/hypervisor/xenserver/xenserver62/patch | 2 +-
scripts/vm/hypervisor/xenserver/xenserver65/patch | 2 +-
scripts/vm/hypervisor/xenserver/xs_cleanup.sh | 1 +
scripts/vm/network/ovs-pvlan-cleanup.sh | 1 +
scripts/vm/network/ovs-pvlan-vm.sh | 1 +
scripts/vm/network/tungsten/create_tap_device.sh | 4 +-
scripts/vm/network/tungsten/delete_tap_device.sh | 5 +-
.../vm/network/tungsten/setup_tungsten_vrouter.sh | 2 +-
server/conf/cloudstack-catalina.logrotate | 2 +-
server/pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 3 -
.../src/main/java/com/cloud/api/ApiDispatcher.java | 11 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 136 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 34 +-
.../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 6 -
.../api/query/dao/DomainRouterJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 10 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 4 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 4 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 12 +-
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 7 -
.../com/cloud/capacity/CapacityManagerImpl.java | 6 +-
.../main/java/com/cloud/configuration/Config.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 104 +-
.../deploy/DeploymentPlanningManagerImpl.java | 65 +-
.../java/com/cloud/event/dao/EventJoinDaoImpl.java | 3 -
.../com/cloud/hypervisor/HypervisorGuruBase.java | 5 +-
.../discoverer/CustomServerDiscoverer.java | 32 -
.../com/cloud/network/IpAddressManagerImpl.java | 50 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 1 -
.../java/com/cloud/network/NetworkServiceImpl.java | 447 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 2 +-
.../cloud/network/router/NetworkHelperImpl.java | 1 -
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 144 +-
.../com/cloud/projects/ProjectManagerImpl.java | 68 +-
.../com/cloud/resource/ResourceManagerImpl.java | 227 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 94 +-
.../com/cloud/server/ConfigurationServerImpl.java | 27 +-
.../com/cloud/server/ManagementServerImpl.java | 172 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 42 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
.../cloud/template/HypervisorTemplateAdapter.java | 16 +-
.../com/cloud/template/TemplateManagerImpl.java | 8 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 122 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 71 +-
.../annotation/AnnotationManagerImpl.java | 10 -
.../cloudstack/backup/BackupManagerImpl.java | 107 +-
.../vm/schedule/VMScheduleManagerImpl.java | 317 --
.../apache/cloudstack/vm/schedule/VMScheduler.java | 36 -
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 405 --
.../core/spring-server-core-managers-context.xml | 46 +-
.../core/spring-server-core-misc-context.xml | 2 +-
.../server-alert-adapter-backend/module.properties | 2 +-
.../server-alert-adapter-compute/module.properties | 2 +-
.../server-alert-adapter-storage/module.properties | 2 +-
.../cloudstack/server-allocator/module.properties | 2 +-
.../cloudstack/server-api/module.properties | 2 +-
.../server-api/spring-server-api-context.xml | 2 +-
.../cloudstack/server-compute/module.properties | 2 +-
.../cloudstack/server-discoverer/module.properties | 2 +-
.../spring-server-discoverer-context.xml | 5 -
.../cloudstack/server-fencer/module.properties | 2 +-
.../server-investigator/module.properties | 2 +-
.../cloudstack/server-network/module.properties | 2 +-
.../cloudstack/server-planner/module.properties | 2 +-
.../cloudstack/server-storage/module.properties | 2 +-
.../server-template-adapter/module.properties | 2 +-
.../system/spring-server-system-context.xml | 2 +-
.../configuration/ConfigurationManagerTest.java | 99 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 155 +-
.../com/cloud/network/IpAddressManagerTest.java | 13 -
.../com/cloud/network/NetworkServiceImplTest.java | 162 +-
.../com/cloud/network/vpc/VpcManagerImplTest.java | 32 +-
.../com/cloud/projects/MockProjectManagerImpl.java | 4 +-
.../com/cloud/projects/ProjectManagerImplTest.java | 98 -
.../cloud/resource/MockResourceManagerImpl.java | 5 -
.../com/cloud/server/ManagementServerImplTest.java | 70 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 224 +-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 25 +
.../apache/cloudstack/acl/RoleManagerImplTest.java | 12 +-
.../cloudstack/backup/BackupManagerTest.java | 67 -
.../networkoffering/CreateNetworkOfferingTest.java | 1 +
.../vm/schedule/VMScheduleManagerImplTest.java | 274 --
.../vm/schedule/VMSchedulerImplTest.java | 397 --
server/src/test/resources/db.properties | 2 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/rdpconsole/rdp-config.bat | 1 +
.../src/main/java/streamer/debug/MockServer.java | 4 +-
.../rdpconsole/src/test/doc/dev-rdp-config.bat | 1 +
.../src/test/java/common/ClientTest.java | 8 +-
.../org.mockito.plugins.MockMaker | 1 -
services/console-proxy/server/pom.xml | 2 +-
.../ConsoleProxyHttpHandlerHelperTest.java | 33 +-
.../org.mockito.plugins.MockMaker | 1 -
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../secondary-storage-discoverer/module.properties | 2 +-
.../resource/NfsSecondaryStorageResourceTest.java | 46 +-
.../org.mockito.plugins.MockMaker | 1 -
setup/bindir/cloud-sysvmadm.in | 2 +
setup/db/221to222upgrade.sh | 2 +
setup/db/create-schema.sql | 1 +
setup/db/index-20to21.sql | 1 +
setup/db/index-212to213.sql | 1 +
setup/db/templates.sql | 1 +
systemvm/agent/certs/realhostip.key | 2 +-
systemvm/agent/js/jquery.js | 2 +-
systemvm/agent/noVNC/app/locale/cs.json | 2 +-
systemvm/agent/noVNC/app/locale/de.json | 2 +-
systemvm/agent/noVNC/app/locale/el.json | 2 +-
systemvm/agent/noVNC/app/locale/es.json | 2 +-
systemvm/agent/noVNC/app/locale/fr.json | 2 +-
systemvm/agent/noVNC/app/locale/it.json | 2 +-
systemvm/agent/noVNC/app/locale/ja.json | 2 +-
systemvm/agent/noVNC/app/locale/ko.json | 2 +-
systemvm/agent/noVNC/app/locale/nl.json | 2 +-
systemvm/agent/noVNC/app/locale/pl.json | 2 +-
systemvm/agent/noVNC/app/locale/pt_BR.json | 2 +-
systemvm/agent/noVNC/app/locale/ru.json | 2 +-
systemvm/agent/noVNC/app/locale/sv.json | 2 +-
systemvm/agent/noVNC/app/locale/tr.json | 2 +-
systemvm/agent/noVNC/app/locale/zh_CN.json | 2 +-
systemvm/agent/noVNC/app/locale/zh_TW.json | 2 +-
systemvm/agent/noVNC/core/input/uskeysym.js | 2 +-
systemvm/agent/noVNC/core/ra2.js | 2 +-
systemvm/agent/noVNC/core/util/md5.js | 2 +-
.../noVNC/keymaps/generate-language-keymaps.py | 2 +-
systemvm/agent/noVNC/keymaps/keymap-ja-atset1.js | 2 +-
systemvm/debian/etc/modprobe.d/pcspkr.conf | 2 +-
.../system/hyperv-daemons.hv-fcopy-daemon.service | 2 +-
.../system/hyperv-daemons.hv-kvp-daemon.service | 2 +-
systemvm/debian/opt/cloud/bin/getRouterAlerts.sh | 2 +-
systemvm/debian/opt/cloud/bin/patched.sh | 2 +-
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 2 +-
.../opt/cloud/bin/update_interface_config.sh | 2 +-
systemvm/debian/opt/cloud/testdata/vmp0001.json | 2 +-
systemvm/pom.xml | 2 +-
.../maint/test_zone_level_local_storage_setting.py | 2 +-
.../component/test_add_remove_network.py | 2 +-
.../component/test_escalations_instances.py | 4 +-
.../component/test_multiple_ips_per_nic.py | 2 +-
.../component/test_multiple_nic_support.py | 10 +-
.../test_multiple_physical_network_creation.py | 10 +-
test/integration/component/test_region_vpc.py | 2 +-
test/integration/component/test_shared_networks.py | 4 +-
test/integration/component/test_vpc.py | 8 +-
.../test_vpc_distributed_routing_offering.py | 2 +-
test/integration/component/test_vpc_network.py | 4 +-
test/integration/component/test_vpc_offerings.py | 2 +-
.../component/test_vpc_vms_deployment.py | 2 +-
test/integration/smoke/test_annotations.py | 7 -
test/integration/smoke/test_guest_os.py | 260 -
test/integration/smoke/test_host_control_state.py | 226 +-
test/integration/smoke/test_kubernetes_clusters.py | 91 +-
test/integration/smoke/test_network.py | 28 +-
test/integration/smoke/test_private_roles.py | 275 --
test/integration/smoke/test_projects.py | 113 -
test/integration/smoke/test_register_userdata.py | 40 +-
test/integration/smoke/test_safe_shutdown.py | 121 -
test/integration/smoke/test_set_sourcenat.py | 274 --
test/integration/smoke/test_vm_autoscaling.py | 10 +-
.../smoke/test_vm_deployment_planner.py | 3 +-
test/integration/smoke/test_vm_schedule.py | 609 ---
test/metadata/func/templates_sync.xml | 3 +
test/pom.xml | 2 +-
test/scripts/bootstrap-regression.sh | 2 +-
test/scripts/build-env.sh | 2 +
test/scripts/checkOutOfMemory.sh | 2 +-
test/scripts/cleanparallel.sh | 3 +
test/scripts/deploy-and-run-regression.sh | 1 +
test/scripts/deploycluster.sh | 5 +
test/scripts/executeUserAPI.sh | 2 +
test/scripts/run.sh | 1 +
test/scripts/usage/allocated.sh | 1 +
test/scripts/usage/volume_usage.sh | 2 +
test/scripts/xen/corrupttemplate.sh | 2 +-
test/scripts/xen/createfaketemplate.sh | 2 +-
test/scripts/xen/killvm.sh | 2 +-
test/scripts/xen/listtemplate.sh | 2 +-
test/scripts/xen/listvdi.sh | 2 +-
test/scripts/xen/listvm.sh | 2 +-
test/scripts/xen/ms.sh | 2 +-
test/scripts/xen/removetemplate.sh | 2 +-
test/scripts/xen/shutdown.sh | 2 +-
test/scripts/xen/sleep.sh | 2 +-
tools/apidoc/gen_toc.py | 3 +-
tools/apidoc/generatecommand.xsl | 1 +
tools/apidoc/generatecustomcommand.xsl | 1 +
tools/apidoc/generategenericcommand.xsl | 1 +
tools/apidoc/generatetoc.xsl | 1 +
tools/apidoc/pom.xml | 2 +-
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/.gitignore | 2 +-
.../binary-installation-advanced/Berksfile | 2 +-
.../binary-installation-advanced/marvin.cfg.erb | 2 +-
.../devcloud4/binary-installation-basic/Berksfile | 2 +-
.../binary-installation-basic/marvin.cfg.erb | 2 +-
.../binary-installation/attributes/default.rb | 2 +-
.../binary-installation/recipes/database_server.rb | 1 +
.../common/binary-installation/recipes/default.rb | 2 +-
.../development-installation/attributes/default.rb | 2 +-
.../recipes/database_server.rb | 1 +
.../development-installation/recipes/default.rb | 2 +-
.../recipes/system_templates.rb | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/devcloud4/prefill.sql | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/docker/Dockerfile.smokedev | 2 +-
tools/eclipse/set-eclipse-profile.sh | 2 +-
tools/git/prepare-commit-msg | 1 +
tools/marvin/marvin/lib/base.py | 188 +-
tools/marvin/marvin/lib/common.py | 9 -
tools/marvin/marvin/lib/utils.py | 12 -
tools/marvin/marvin/misc/build/vm-start.sh | 1 +
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/ngui/static/bootstrap/js/bootstrap.min.js | 2 +-
tools/ngui/static/js/app/dashboard/dashboard.js | 1 +
.../static/js/app/infrastructure/infrastructure.js | 1 +
tools/ngui/static/js/lib/angular.js | 2 +-
tools/pom.xml | 2 +-
tools/transifex/.tx/config | 1 +
tools/transifex/sync-transifex-ui.sh | 1 +
.../database_comparision_during_upgrade/README | 1 +
.../before_upgrade_data_collection.sh | 2 +
.../fresh_install_data_collection.sh | 1 +
.../test_config_before_and_after_upgrade.sh | 1 +
...test_config_between_fresh_and_upgraded_setup.sh | 13 +
.../usage_schema_comparison.sh | 1 +
tools/whisker/LICENSE | 1 +
ui/.babelrc | 2 +-
ui/.gitattributes | 2 +-
ui/jest.config.js | 4 +-
ui/package-lock.json | 5006 ++++++++++----------
ui/package.json | 9 +-
ui/public/assets/banner.svg | 2 +-
ui/public/assets/logo.svg | 2 +-
ui/public/assets/mini-logo.svg | 2 +-
ui/public/config.json | 2 +-
ui/public/js/less.min.js | 2 +-
ui/public/locales/ar.json | 2 +-
ui/public/locales/ca.json | 2 +-
ui/public/locales/de_DE.json | 2 +-
ui/public/locales/el_GR.json | 4 +-
ui/public/locales/en.json | 68 +-
ui/public/locales/es.json | 2 +-
ui/public/locales/fr_FR.json | 2 +-
ui/public/locales/hi.json | 2 +-
ui/public/locales/hu.json | 2 +-
ui/public/locales/it_IT.json | 2 +-
ui/public/locales/ja_JP.json | 2 -
ui/public/locales/ko_KR.json | 4 +-
ui/public/locales/nb_NO.json | 2 +-
ui/public/locales/nl_NL.json | 2 +-
ui/public/locales/pl.json | 2 +-
ui/public/locales/pt_BR.json | 4 +-
ui/public/locales/ru_RU.json | 2 +-
ui/public/locales/zh_CN.json | 4 +-
ui/src/assets/icons/dark.svg | 2 +-
ui/src/assets/icons/debian.svg | 2 +-
ui/src/assets/icons/kubernetes.svg | 2 +-
ui/src/assets/icons/light.svg | 2 +-
ui/src/components/CheckBoxSelectPair.vue | 5 +-
ui/src/components/header/ProjectMenu.vue | 12 +
ui/src/components/header/SamlDomainSwitcher.vue | 4 +-
ui/src/components/header/UserMenu.vue | 77 +-
ui/src/components/multitab/index.less | 2 +-
ui/src/components/page/GlobalLayout.vue | 183 +-
ui/src/components/view/ActionButton.vue | 26 +-
ui/src/components/view/AnnotationsTab.vue | 3 +-
ui/src/components/view/BulkActionProgress.vue | 56 +-
ui/src/components/view/BulkActionView.vue | 56 +-
ui/src/components/view/DedicateDomain.vue | 12 +-
ui/src/components/view/DetailsTab.vue | 14 +-
ui/src/components/view/EventsTab.vue | 12 +-
ui/src/components/view/InfoCard.vue | 35 +-
.../view/InstanceNicsNetworkSelectListView.vue | 48 +-
.../InstanceVolumesStoragePoolSelectListView.vue | 36 +-
ui/src/components/view/ListResourceTable.vue | 30 +-
ui/src/components/view/ListView.vue | 733 ++-
ui/src/components/view/NicNetworkSelectForm.vue | 20 +-
ui/src/components/view/SearchView.vue | 4 +-
ui/src/components/view/StoragePoolSelectView.vue | 102 +-
ui/src/components/view/TreeView.vue | 191 +-
ui/src/components/view/VolumesTab.vue | 43 +-
ui/src/components/widgets/Breadcrumb.vue | 2 +-
ui/src/components/widgets/Console.vue | 22 +-
ui/src/components/widgets/Status.vue | 18 +-
ui/src/config/section/account.js | 5 +-
ui/src/config/section/compute.js | 22 +-
ui/src/config/section/config.js | 99 -
ui/src/config/section/event.js | 9 -
ui/src/config/section/image.js | 2 -
ui/src/config/section/infra/clusters.js | 1 -
ui/src/config/section/infra/hosts.js | 15 +-
ui/src/config/section/infra/ilbvms.js | 1 -
ui/src/config/section/infra/managementServers.js | 49 -
ui/src/config/section/infra/pods.js | 1 -
ui/src/config/section/infra/zones.js | 1 -
ui/src/config/section/network.js | 13 +-
ui/src/config/section/offering.js | 4 +-
ui/src/config/section/project.js | 2 +-
ui/src/config/section/storage.js | 1 -
ui/src/config/section/user.js | 6 +-
ui/src/core/lazy_lib/components_use.js | 4 -
ui/src/core/lazy_lib/icons_use.js | 4 -
ui/src/layouts/UserLayout.vue | 3 +-
ui/src/permission.js | 5 +-
ui/src/store/getters.js | 4 +-
ui/src/store/modules/app.js | 6 -
ui/src/store/modules/user.js | 25 +-
ui/src/style/common/function.less | 2 +-
ui/src/style/dark-mode.less | 64 +-
ui/src/style/frame/content.less | 2 +-
ui/src/style/frame/search.less | 2 +-
ui/src/style/frame/sider.less | 2 +-
ui/src/style/frame/top-menu.less | 2 +-
ui/src/style/index.less | 4 +-
ui/src/style/objects/table.less | 2 +-
ui/src/style/vars.less | 31 +-
ui/src/utils/request.js | 3 +-
ui/src/views/AutogenView.vue | 200 +-
ui/src/views/auth/Login.vue | 13 +-
ui/src/views/compute/AssignInstance.vue | 6 +-
ui/src/views/compute/AttachIso.vue | 4 +-
ui/src/views/compute/AutoScaleDownPolicyTab.vue | 89 +-
ui/src/views/compute/AutoScaleLoadBalancing.vue | 94 +-
ui/src/views/compute/AutoScaleUpPolicyTab.vue | 81 +-
ui/src/views/compute/AutoScaleVmProfile.vue | 52 +-
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 106 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 20 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 4 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 5 +-
ui/src/views/compute/DeployVM.vue | 62 +-
ui/src/views/compute/DestroyVM.vue | 10 +-
ui/src/views/compute/EditVM.vue | 6 +-
ui/src/views/compute/InstanceSchedules.vue | 461 --
ui/src/views/compute/InstanceTab.vue | 15 +-
ui/src/views/compute/KubernetesServiceTab.vue | 84 +-
ui/src/views/compute/MigrateWizard.vue | 143 +-
ui/src/views/compute/RegisterUserData.vue | 11 +-
ui/src/views/compute/ResetSshKeyPair.vue | 10 +-
ui/src/views/compute/ResetUserData.vue | 20 +-
ui/src/views/compute/ScaleKubernetesCluster.vue | 4 +-
ui/src/views/compute/StartVirtualMachine.vue | 12 +-
ui/src/views/compute/UpgradeKubernetesCluster.vue | 4 +-
ui/src/views/compute/backup/BackupSchedule.vue | 108 +-
ui/src/views/compute/backup/FormSchedule.vue | 15 +-
.../compute/wizard/ComputeOfferingSelection.vue | 11 +-
.../views/compute/wizard/DiskOfferingSelection.vue | 36 +-
.../views/compute/wizard/LoadBalancerSelection.vue | 7 +-
ui/src/views/compute/wizard/MultiDiskSelection.vue | 84 +-
.../views/compute/wizard/MultiNetworkSelection.vue | 85 +-
.../views/compute/wizard/NetworkConfiguration.vue | 88 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 46 +-
.../views/compute/wizard/SshKeyPairSelection.vue | 11 +-
ui/src/views/compute/wizard/UserDataSelection.vue | 10 +-
ui/src/views/dashboard/CapacityDashboard.vue | 2 +-
ui/src/views/dashboard/SetupTwoFaAtLogin.vue | 4 +
ui/src/views/dashboard/UsageDashboard.vue | 12 +-
ui/src/views/iam/AddAccount.vue | 12 +-
ui/src/views/iam/AddLdapAccount.vue | 42 +-
ui/src/views/iam/AddUser.vue | 8 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 4 +-
ui/src/views/iam/CreateRole.vue | 9 +-
ui/src/views/iam/DomainActionForm.vue | 18 +-
ui/src/views/iam/DomainView.vue | 11 +-
ui/src/views/iam/EditUser.vue | 4 +-
ui/src/views/iam/ImportRole.vue | 6 +-
ui/src/views/iam/PermissionEditable.vue | 6 +-
ui/src/views/iam/RolePermissionTab.vue | 1 +
ui/src/views/iam/SSLCertificateTab.vue | 52 +-
ui/src/views/iam/SetupTwoFaAtUserProfile.vue | 4 +
ui/src/views/image/IsoZones.vue | 90 +-
ui/src/views/image/RegisterOrUploadIso.vue | 105 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 157 +-
ui/src/views/image/TemplateZones.vue | 63 +-
ui/src/views/image/UpdateISO.vue | 19 +-
.../image/UpdateKubernetesSupportedVersion.vue | 4 +-
ui/src/views/image/UpdateTemplate.vue | 17 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 8 +-
ui/src/views/infra/AddPrimaryStorage.vue | 30 +-
ui/src/views/infra/AddSecondaryStorage.vue | 4 +-
ui/src/views/infra/AsyncJobsTab.vue | 104 -
ui/src/views/infra/ClusterAdd.vue | 9 +-
ui/src/views/infra/Confirmation.vue | 129 -
ui/src/views/infra/HostAdd.vue | 14 +-
ui/src/views/infra/HostEnableDisable.vue | 133 -
ui/src/views/infra/InfraSummary.vue | 4 +-
ui/src/views/infra/MigrateData.vue | 16 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 44 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 4 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 56 +-
.../views/infra/network/IpRangesTabManagement.vue | 54 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 144 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 36 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 39 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 5 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 5 +-
.../network/providers/AddPaloAltoFirewall.vue | 5 +-
.../views/infra/network/providers/ProviderItem.vue | 12 +-
.../infra/network/providers/ProviderListView.vue | 130 +-
ui/src/views/infra/routers/RouterHealthCheck.vue | 10 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 18 +-
ui/src/views/infra/zone/StaticInputsForm.vue | 3 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 7 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 251 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 13 +-
ui/src/views/network/AclListRulesTab.vue | 25 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 52 +-
ui/src/views/network/CreateL2NetworkForm.vue | 4 +-
ui/src/views/network/CreateNetworkPermission.vue | 9 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 10 +-
ui/src/views/network/CreateVlanIpRange.vue | 4 +-
ui/src/views/network/CreateVpc.vue | 26 +-
ui/src/views/network/CreateVpnCustomerGateway.vue | 36 +-
ui/src/views/network/EgressRulesTab.vue | 66 +-
ui/src/views/network/EnableStaticNat.vue | 82 +-
ui/src/views/network/FirewallRules.vue | 72 +-
ui/src/views/network/GuestIpRanges.vue | 7 +-
ui/src/views/network/GuestVlanNetworksTab.vue | 24 +-
.../views/network/IngressEgressRuleConfigure.vue | 99 +-
ui/src/views/network/InternalLBAssignVmForm.vue | 11 +-
ui/src/views/network/InternalLBAssignedVmTab.vue | 46 +-
ui/src/views/network/IpAddressesTab.vue | 194 +-
ui/src/views/network/Ipv6FirewallRulesTab.vue | 82 +-
ui/src/views/network/LoadBalancing.vue | 401 +-
ui/src/views/network/NetworkPermissions.vue | 45 +-
ui/src/views/network/NicsTable.vue | 28 +-
ui/src/views/network/PortForwarding.vue | 184 +-
ui/src/views/network/ReservePublicIP.vue | 6 +-
ui/src/views/network/RoutersTab.vue | 50 +-
ui/src/views/network/UpdateNetwork.vue | 25 +-
ui/src/views/network/VpcTab.vue | 72 +-
ui/src/views/network/VpcTiersTab.vue | 100 +-
.../views/network/tungsten/FirewallPolicyTab.vue | 48 +-
ui/src/views/network/tungsten/FirewallRuleTab.vue | 81 +-
ui/src/views/network/tungsten/FirewallTagTab.vue | 38 +-
ui/src/views/network/tungsten/LogicalRouterTab.vue | 6 +-
ui/src/views/network/tungsten/NetworkPolicyTab.vue | 40 +-
ui/src/views/network/tungsten/TungstenFabric.vue | 60 +-
.../network/tungsten/TungstenFabricPolicyRule.vue | 66 +-
.../network/tungsten/TungstenFabricPolicyTag.vue | 48 +-
.../network/tungsten/TungstenNetworkTable.vue | 83 +-
ui/src/views/offering/AddComputeOffering.vue | 25 +-
ui/src/views/offering/AddDiskOffering.vue | 9 +-
ui/src/views/offering/AddNetworkOffering.vue | 9 +-
ui/src/views/offering/AddVpcOffering.vue | 5 +-
ui/src/views/offering/ImportBackupOffering.vue | 4 +-
ui/src/views/plugins/quota/QuotaBalance.vue | 24 +-
ui/src/views/plugins/quota/QuotaUsage.vue | 18 +-
ui/src/views/project/AccountsTab.vue | 96 +-
ui/src/views/project/AddAccountOrUserToProject.vue | 16 +-
ui/src/views/project/InvitationsTemplate.vue | 68 +-
.../views/project/iam/ProjectRolePermissionTab.vue | 1 +
ui/src/views/project/iam/ProjectRoleTab.vue | 57 +-
ui/src/views/setting/ConfigurationHierarchy.vue | 22 +-
ui/src/views/setting/ConfigurationTab.vue | 4 +-
ui/src/views/setting/ConfigurationTable.vue | 12 +-
ui/src/views/storage/AttachVolume.vue | 4 +-
ui/src/views/storage/ChangeOfferingForVolume.vue | 5 +-
.../views/storage/CreateSnapshotFromVMSnapshot.vue | 5 +-
ui/src/views/storage/CreateVolume.vue | 5 +-
ui/src/views/storage/FormSchedule.vue | 18 +-
ui/src/views/storage/MigrateVolume.vue | 4 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 9 +-
ui/src/views/storage/ScheduledSnapshots.vue | 126 +-
ui/src/views/storage/UploadLocalVolume.vue | 24 +-
ui/src/views/storage/UploadVolume.vue | 17 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 15 +-
ui/src/views/tools/ManageInstances.vue | 32 +-
ui/tests/mockData/ActionButton.mock.json | 2 +-
ui/tests/mockData/AutogenView.mock.json | 6 +-
ui/tests/mockData/MigrateWizard.mock.json | 2 +-
ui/tests/unit/components/view/ActionButton.spec.js | 1 -
ui/tests/unit/views/AutogenView.spec.js | 26 +-
ui/tests/unit/views/compute/MigrateWizard.spec.js | 13 +-
ui/vue.config.js | 1 -
usage/pom.xml | 2 +-
utils/pom.xml | 8 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 43 +-
utils/src/main/java/com/cloud/utils/LogUtils.java | 15 +-
.../utils/concurrency/SynchronizationEvent.java | 4 +-
.../test/java/com/cloud/utils/FileUtilTest.java | 25 +-
.../src/test/java/com/cloud/utils/ScriptTest.java | 2 +-
.../test/java/com/cloud/utils/TestProfiler.java | 9 +-
.../com/cloud/utils/UriUtilsParametrizedTest.java | 21 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 29 +-
.../java/com/cloud/utils/ssh/SshHelperTest.java | 26 +-
.../cloud/utils/validation/ChecksumUtilTest.java | 20 +-
.../utils/jsinterpreter/JsInterpreterTest.java | 12 +-
.../ReflectionToStringBuilderUtilsTest.java | 103 +-
.../org.mockito.plugins.MockMaker | 1 -
vmware-base/pom.xml | 2 +-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 2 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 20 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 4 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 23 +-
.../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 4 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 2 +-
.../hypervisor/vmware/mo/VmwareHypervisorHost.java | 6 -
.../hypervisor/vmware/util/VmwareContext.java | 2 +-
.../hypervisor/vmware/mo/DatastoreMOTest.java | 45 +-
.../com/cloud/hypervisor/vmware/mo/HostMOTest.java | 97 -
.../vmware/mo/HypervisorHostHelperTest.java | 17 +-
.../hypervisor/vmware/mo/VirtualMachineMOTest.java | 15 +-
.../hypervisor/vmware/util/VmwareContextTest.java | 5 +-
.../hypervisor/vmware/util/VmwareHelperTest.java | 5 +-
.../org.mockito.plugins.MockMaker | 1 -
1240 files changed, 10308 insertions(+), 25234 deletions(-)
delete mode 100644
agent/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/BaseListRetrieveOnlyResourceCountCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/guest/GetHypervisorGuestOsNamesCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/HypervisorGuestOsNamesResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/HypervisorGuestOsResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/userdata/UserDataManager.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedule.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManager.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJob.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateNetworkOfferingCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmdTest.java
delete mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmdTest.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/CheckGuestOsMappingAnswer.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/CheckGuestOsMappingCommand.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/GetHypervisorGuestOsNamesAnswer.java
delete mode 100644
core/src/main/java/com/cloud/agent/api/GetHypervisorGuestOsNamesCommand.java
delete mode 100644
core/src/test/java/com/cloud/agent/api/GetHypervisorGuestOsNamesAnswerTest.java
delete mode 100644
core/src/test/java/com/cloud/agent/api/GetHypervisorGuestOsNamesCommandTest.java
delete mode 100644
core/src/test/java/org/apache/cloudstack/api/agent/test/CheckGuestOsMappingAnswerTest.java
delete mode 100644
core/src/test/java/org/apache/cloudstack/api/agent/test/CheckGuestOsMappingCommandTest.java
delete mode 100644
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41810to41900.java
delete mode 100644
engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java
delete mode 100644
engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJobVO.java
delete mode 100644
engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDao.java
delete mode 100644
engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDaoImpl.java
delete mode 100644
engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDao.java
delete mode 100644
engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDaoImpl.java
delete mode 100644
engine/schema/src/main/resources/META-INF/db/schema-41810to41900-cleanup.sql
delete mode 100644
engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
delete mode 100644 engine/userdata/cloud-init/pom.xml
delete mode 100644
engine/userdata/cloud-init/src/main/java/org/apache/cloudstack/userdata/CloudInitUserDataProvider.java
delete mode 100644
engine/userdata/cloud-init/src/main/resources/META-INF/cloudstack/core/spring-userdata-cloud-init-context.xml
delete mode 100644
engine/userdata/cloud-init/src/test/java/org/apache/cloudstack/userdata/CloudInitUserDataProviderTest.java
delete mode 100644 engine/userdata/pom.xml
delete mode 100644
engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java
delete mode 100644
engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataProvider.java
delete mode 100644
engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml
delete mode 100644
engine/userdata/src/test/java/org/apache/cloudstack/userdata/UserDataManagerImplTest.java
rename plugins/acl/project-role-based/src/{ =>
main}/test/java/org/apache/cloudstack/acl/ProjectRoleBasedApiAccessCheckerTest.java
(87%)
delete mode 100644
plugins/acl/project-role-based/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStoragePoolTest.java.bkp
delete mode 100644
plugins/hypervisors/kvm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/hypervisors/vmware/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java
delete mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java
delete mode 100644
plugins/hypervisors/xenserver/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/AddVirtualMachinesToKubernetesClusterCmd.java
delete mode 100644
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/RemoveVirtualMachinesFromKubernetesClusterCmd.java
delete mode 100644
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/RemoveVirtualMachinesFromKubernetesClusterResponse.java
delete mode 100644
plugins/integrations/kubernetes-service/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/network-elements/elastic-loadbalancer/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename
plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/{ListTungstenFabricApplicationPolicySetCmdTest.java
=> ListTungstenFabricApplictionPolicySetCmdTest.java} (62%)
delete mode 100644
plugins/network-elements/tungsten/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/shutdown/pom.xml
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/BaseShutdownActionCmd.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/CancelShutdownCmd.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/PrepareForShutdownCmd.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/ReadyForShutdownCmd.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/TriggerShutdownCmd.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/api/response/ReadyForShutdownResponse.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManager.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManagerImpl.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/command/BaseShutdownManagementServerHostCommand.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/command/CancelShutdownManagementServerHostCommand.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/command/PrepareForShutdownManagementServerHostCommand.java
delete mode 100644
plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/command/TriggerShutdownManagementServerHostCommand.java
delete mode 100644
plugins/shutdown/src/main/resources/META-INF/cloudstack/shutdown/module.properties
delete mode 100644
plugins/shutdown/src/main/resources/META-INF/cloudstack/shutdown/spring-shutdown-context.xml
delete mode 100644
plugins/shutdown/src/test/java/org/apache/cloudstack/shutdown/ShutdownManagerImplTest.java
delete mode 100644
plugins/storage/volume/scaleio/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
plugins/user-authenticators/ldap/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
server/src/main/java/com/cloud/hypervisor/discoverer/CustomServerDiscoverer.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduler.java
delete mode 100644
server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java
delete mode 100644
server/src/test/java/com/cloud/projects/ProjectManagerImplTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImplTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/vm/schedule/VMSchedulerImplTest.java
delete mode 100644
services/console-proxy/rdpconsole/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
services/console-proxy/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
services/secondary-storage/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 test/integration/smoke/test_guest_os.py
delete mode 100644 test/integration/smoke/test_private_roles.py
delete mode 100644 test/integration/smoke/test_safe_shutdown.py
delete mode 100644 test/integration/smoke/test_set_sourcenat.py
delete mode 100644 test/integration/smoke/test_vm_schedule.py
delete mode 100644 ui/src/views/compute/InstanceSchedules.vue
delete mode 100644 ui/src/views/infra/AsyncJobsTab.vue
delete mode 100644 ui/src/views/infra/Confirmation.vue
delete mode 100644 ui/src/views/infra/HostEnableDisable.vue
delete mode 100644
utils/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644
vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/HostMOTest.java
delete mode 100644
vmware-base/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
