This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch disableDeprecatedPlugins
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 1d3bad0fecd remove var from configuration
omit 5aea69f6144 remaining ucs vars removed
omit dde3e1e352c remove ucsa vars
omit 8071ff35cb6 remove hyperv from ui
omit c1c01e34da6 disable deprecated plugins
add 15c2e50338a UI: fix typo Upload SSL certificate (#11869)
add e66926e6a4e Merge branch '4.22'
add dbda673e1fa Updating pom.xml version numbers for release
4.23.0.0-SNAPSHOT
add 81b2c38be9a Merge branch '4.22'
add a50de029bf1 Add empty Provider value in Network/VPC Offering form
(#11982)
add 8c86f24261c enhancement: add instance info as Libvirt metadata (#11061)
add 40c8bc528d3 Keeping consistency with other error messages. (#11649)
add 23fb0e2ccb4 Update GUI Kubernetes logo (#11895)
add 5f9e1311989 Svgs (#12051)
add f985a67f4d6 Fixes:#7837: Add isolationMethods and vlan to
TrafficTypeResponse (#8151)
add dc8f4655278 engine-schema: upgrade path for 4.23.0 (#12048)
add 8b034dc439d chore: rename workflow `linter.yml` to `pre-commit.yml`
(#11647)
add a5b455ff3a8 pre-commit: auto add table of contents with `doctoc`
(#11679)
add fff4cafdca2 ui(locales): remove duplicates and fix typos (#11872)
add ac3b18095af pre-commit use colored text in the CI for `pass / fail /
skipped` (#11977)
add 86ae1fee7ff Standardize and auto add license headers for SQL files
with pre-commit (#12071)
add 4ed86a2627a pre-commit upgrade codespell; fix spelling; (#10144)
add aa18188d305 pre-commit: auto add license headers for all YAML files
(#12069)
add 39126a43392 Standardize and auto add license headers for Shell files
with pre-commit (#12070)
add 6dc259c7dab Rename and standardize issue templates to `.yml` (#12082)
add 8171d9568c9 Block use of internal and external snapshots on KVM
(#11039)
add 9032fe3fb53 merge LTS branch 4.22 into main
add 4e61ddd1bcf import
add 5798fb43a3a Fix upgrade files (#12155)
add db6147060b5 Rename PRE-COMMIT.md to PRE_COMMIT.md and fix link (#12157)
add f3a112fd9e7 use upstream method for creating enums from strings
(#12158)
add 26009659f9b Merge remote-tracking branch 'apache/4.22'
add b0d74fe00c0 Merge branch '4.22'
add c81295439f8 removed code in comments (#11145)
add 5151f8dc6a9 java dependabot file (#11409)
add 51910cd2606 Add license information to dependabot.yaml
add 3c6484792d8 UI: Create Account form to set proper domain and role
based on route (#12200)
add cfe96026dc4 Standardize and auto add license headers to all Vue files
with pre-commit (#12081)
add 78f9e6584b9 UI(vue) + extras: fix bugs/spelling and standardize
(#12073)
add f417c6b0a1d yamllint use `extends: default` (#12066)
add 1919dcfb7ce pre-commit trailing-whitespace cleanup LICENSE/NOTICE
(#12242)
add f570e168364 .github: initial version of Code Owners (#12253)
add 39d0d62fddd api,server: normalize string empty value on config update
(#11770)
add da1c7cebf94 server: trim autoscale Windows VM hostname (#11327)
add f06ac512fa9 merge forward 4.22 to main
add 53a39d3ff79 .github: Move `dependabot.yml` to the correct directory
(#12243)
add 124fcde59c4 unlink an ldap domain (#11962)
add 2ac2e5ba33f Github Action: Add action to auto close issues/PRs after a
certain time (#8667)
add 10d76d3384a Bump cs.aws.sdk.version from 1.12.439 to 1.12.795 (#12267)
add e21aacf5bea Bump `actions/cache` to `v5` (#12247)
add 91376c79945 cleanup LDAP code according to warnings (#11436)
add 28820f6e253 Bump org.influxdb:influxdb-java from 2.22 to 2.25 (#12270)
add bb5da0e49cf security groups: conntrack only if needed (#10594)
add 13f805fbf3b Log4j2 refactor cloud api module (#8728)
add 558232e8e6b Feature s390x multiarch support (#12214)
add eb93f0105e3 Bump com.zaxxer:HikariCP from 5.1.0 to 7.0.2 (#12266)
add e2d37733623 Merge release branch 4.22 to main
add 22da57f922d Merge branch '4.22'
add e0c13cc3ec5 Cleanup userconcentratedpod_random and
userconcentratedpod_firstfit allocation algorithms (#12233)
add 5bf869c8034 Replace deprecated 'egrep' commands with 'grep -E'.
(#12306)
add 34b8870f591 systemvm-template: support on-demand download during setup
and registration (#11656)
add 40d21f093f9 Merge branch '4.22'
add 46cb805c902 Removal of internal ID in backup event descriptions
(#12197)
add 81b991ae9c9 Show volume UUIDs in the backup details page (#12156)
add cd557969727 webhook: fixes, filter enhancement (#12023)
add 4628385051c Merge branch '4.22'
add c465caf81e7 Adjust close periods (#12376)
add eedd32971f7 Merge remote-tracking branch 'apache/4.22'
add e47d7bc6ff1 [CI] Dependabot: add a cooldown period for new releases
(#12384)
add fd1c67f4739 Standardize and auto add license headers to properties
files (#12231)
add bc76f2042d7 Change migration volume exception messages (#12367)
add 1ef63657716 Change internal ID to UUID in user disable event (#11824)
add 1b861dad48f Cleanup: Standardize logger message formatting in
ApiServer.java (#11188)
add 28112175785 Merge branch '4.22'
add 2358632253a Fixed User type accounts being able to change resource
limits of their own domain and account (#12046)
add b8813c7b243 UI: Add info for 'Use primary storage replication' in
snapshot view(s) (#11943)
add 538578366a7 Merge remote-tracking branch 'apache/4.22'
add 507c4cd1289 Merge branch '4.22'
add a566af35f5c Review comment on pull request #12436
add b31c2f4cae1 Revert "Review comment on pull request #12436"
add 002d9768b28 Add settings to mark cryptographic algorithms in vpn
customer gateways as excluded or obsolete (#12193)
add 8b2f1f19c27 Support dedicating backup offerings to domains (#12194)
add 04b58acdd64 Merge branch '4.22'
add e2f4ed9dcf1 Bump commons-codec:commons-codec from 1.15 to 1.20.0
(#12303)
add 1b0a036a5b7 Bump ads.version from 2.0.0.AM25 to 2.0.0.AM27 (#12269)
add 420bf6dff84 Merge branch '4.22'
add 6e5d78a8a78 Fix NPE on adding new columns in the tables (#12464)
add b5e9178078f UI: fix issues when deploy VNF applicance on network with
SG (#12436)
add cd5bb09d0d1 Fix potential leaks in executePipedCommands (#12478)
add d1eb2822d9d Remove redundant Exceptions from logs for vm schedules
(#12428)
add 6846619a6f1 Fix update network offering domainids size limitation
(#12431)
add 6a9835904cb Fix for zoneids parameters length on updateAPIs (#12440)
add bce3e54a7e4 improve error handling for template upload notifications
(#12412)
add 8db065a14eb limit iso filename to have 251 chars at max (#12430)
add 000919d6e5d Merge branch '4.20' into 4.22
add 4bcf3ea57d9 Merge branch '4.22'
add 315cd52fd1a snapshot: fix listSnapshots for volume which got delete
and whose storage pool got deleted (#12433)
add c8cadcb56e5 NPE fix while deleting storage pool when pool has detached
volumes (#12451)
add 4adb7195701 Allow modification of user vm details if
user.vm.readonly.details is empty (#10456)
add 0958dfc1386 Fix: proper permissions for systemvm template
registrations on hardened systems (#12098)
add d010e9fcf29 Notify user if template upgrade is not required (#12483)
add 63bdc2b9903 Add log for null templateVO (#12406)
add 097c3a018ba ConfigDrive: use file absolute path instead of canonical
path to create ISO (#11623)
add 36edd92e480 Fix snapshot physical size after migration (#12166)
add 44793da58f2 fix Sensitive Data Exposure Through Exception Logging in
OVM Hypervis… (#12032)
add bbc23a74683 fix install path for systemvm templates when introducing
new sec storage (#11605)
add edb62b490c6 Merge branch '4.20' into 4.22
add e3999923a7b Merge release branch 4.22 to main
add d50899427a7 merge forward error
add 7178bfe9ebe Merge release branch 4.22 to main
add 88181ebe722 Standardize and auto add license headers to all cfg files
with pre-commit (#12230)
add f292143af88 Fix/prometheus metadata sorting (#12112)
add ac2242ece23 api,server,ui: support tags for domains (#11964)
add 416568a373f Fix typo in finalyzeAccountId (#11990)
add cd2d71104ed Implement SSVM storage network IP to API response and GUI
details tab (#11979)
add d6c192c0f08 fix template id unmanaged vm (#12288)
add 9b0c28c16da fix regression in the listBackupSchedules API (#12402)
add 128dbe2c0be Refactor configuration SystemVMDefaultHypervisor (#8934)
add ca076637183 Show backup offerings with userDrivenBackupsAllowed=false
to all users (#11889)
add cabd9a98e13 Implemented auto refresh button for VM metrics (#10900)
add 5fd5b625700 server: fix remove management server (#12147)
add 2056c582f1c Fix logging of forwarded IPs in logs (#11854)
add d722c9551a5 ui: fix form data double fetch/reset DeployVMFromBackup
form data by ownership selection (#11706)
add 9dee1372658 debian/control: remove python2 as dependency of build
environment (#12213)
add 7536516e416 add missing label text for label.aclname (#12511)
add 63c8b5fc562 api/server: support deploy-as-is template as VNF template
(#12499)
add fa3dee886ed do not add disk cache mode from an empty string (#12248)
add 5bb5af4c480 4.20: Fix unit test failure (#12520)
add f73362ae48a Fix saml bug unable to login (#10868)
add ff0cfc9148a Add ability to filter by version for listHosts and
listMgmtServers APIs (#12472)
add fce69fbfe0b VM Power state optimization (#12463)
add 0458c5328bf Consider secondary storage selectors during template
synchronization (#10956)
add b6134418eaf server: do not run dhcp and dns check if VR is not
provider (#12272)
add ca5232778da CKS: Use Zone MTUs when network is created at the time of
CKS cluster creation (#12228)
add af9d68630f7 Initialize template status='Processing' (#11970)
add c0b5358d8eb fix Host Password Exposed in Command-Line Logging (#12016)
add 75db42bca6a Merge branch '4.20' into 4.22
add cb822feb724 Merge branch '4.22'
add 5aced732504 ui: reset configuration allowed only when value not
default (#11728)
add 6026d69494d disable deprecated plugins
add 60957e51f1c remove hyperv from ui
add 78bf6f4143f remove ucsa vars
add c6c8ae0de6b remaining ucs vars removed
add 135eb8042c1 remove var from configuration
add 0e42c76c6e0 remove some extra stuff
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 (1d3bad0fecd)
\
N -- N -- N refs/heads/disableDeprecatedPlugins (0e42c76c6e0)
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:
.../CODEOWNERS | 9 +-
.../{feature_request.yaml => feature_request.yml} | 0
.github/boring-cyborg.yml | 2 -
.../dependabot.yml | 15 +-
.github/linters/.yamllint.yml | 3 +-
.github/linters/codespell.txt | 47 +-
.github/workflows/main-sonar-check.yml | 4 +-
.github/workflows/{linter.yml => pre-commit.yml} | 6 +-
.github/workflows/sonar-check.yml | 4 +-
.github/workflows/stale.yml | 43 +
.pre-commit-config.yaml | 83 +-
CONTRIBUTING.md | 18 +
INSTALL.md | 18 +-
LICENSE | 242 ++--
NOTICE | 52 +-
PRE-COMMIT.md => PRE_COMMIT.md | 2 +-
README.md | 18 +
agent/pom.xml | 2 +-
agent/src/main/java/com/cloud/agent/Agent.java | 1 -
.../cloud/agent/properties/AgentProperties.java | 4 +-
api/pom.xml | 2 +-
.../com/cloud/agent/api/storage/OVFHelper.java | 53 +-
.../com/cloud/agent/api/storage/OVFParser.java | 4 +-
.../agent/api/to/VirtualMachineMetadataTO.java | 182 +++
.../com/cloud/agent/api/to/VirtualMachineTO.java | 9 +
api/src/main/java/com/cloud/cpu/CPU.java | 3 +-
.../com/cloud/deploy/DeploymentClusterPlanner.java | 4 +-
.../java/com/cloud/deploy/DeploymentPlanner.java | 2 +-
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
api/src/main/java/com/cloud/host/HostStats.java | 1 -
.../main/java/com/cloud/hypervisor/Hypervisor.java | 1 -
.../java/com/cloud/network/NetworkService.java | 4 +
.../cloud/network/PhysicalNetworkTrafficType.java | 2 +
.../cloud/network/rules/LbStickinessMethod.java | 4 +-
.../main/java/com/cloud/server/ResourceTag.java | 10 +-
api/src/main/java/com/cloud/storage/Storage.java | 2 +-
.../main/java/com/cloud/user/AccountService.java | 5 +-
.../java/org/apache/cloudstack/acl/RoleType.java | 4 +-
.../org/apache/cloudstack/acl/SecurityChecker.java | 4 +
.../org/apache/cloudstack/alert/AlertService.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 5 +
.../apache/cloudstack/api/BaseBackupListCmd.java | 2 +-
.../java/org/apache/cloudstack/api/BaseCmd.java | 2 +-
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 4 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 2 +-
.../admin/backup/ImportBackupOfferingCmd.java | 22 +
.../admin/backup/UpdateBackupOfferingCmd.java | 30 +-
.../api/command/admin/cluster/AddClusterCmd.java | 4 +-
.../command/admin/cluster/UpdateClusterCmd.java | 2 +-
.../api/command/admin/config/UpdateCfgCmd.java | 12 +-
...UploadTemplateDirectDownloadCertificateCmd.java | 2 +-
.../api/command/admin/domain/ListDomainsCmd.java | 4 +-
.../api/command/admin/host/ListHostsCmd.java | 9 +-
.../api/command/admin/host/UpdateHostCmd.java | 2 +-
.../admin/iso/ListIsoPermissionsCmdByAdmin.java | 2 +-
.../api/command/admin/management/ListMgmtsCmd.java | 8 +
.../network/DeleteManagementNetworkIpRangeCmd.java | 2 +-
.../network/DeleteStorageNetworkIpRangeCmd.java | 2 +-
.../network/ListStorageNetworkIpRangeCmd.java | 2 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 66 +-
.../UpdatePodManagementNetworkIpRangeCmd.java | 2 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 63 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 63 +-
.../ListTemplatePermissionsCmdByAdmin.java | 2 +-
.../api/command/admin/usage/AddTrafficTypeCmd.java | 12 +-
.../command/admin/usage/ListTrafficTypesCmd.java | 3 +-
.../command/admin/usage/UpdateTrafficTypeCmd.java | 12 +-
.../api/command/admin/user/DisableUserCmd.java | 4 +-
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 2 +-
.../admin/vm/ImportUnmanagedInstanceCmd.java | 14 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 2 +-
.../api/command/admin/volume/ImportVolumeCmd.java | 2 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 6 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 65 +-
.../command/offering/DomainAndZoneIdResolver.java | 114 ++
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +-
.../command/user/autoscale/CreateConditionCmd.java | 2 +-
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 2 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 2 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 2 +-
.../command/user/autoscale/DeleteConditionCmd.java | 2 +-
.../api/command/user/backup/CreateBackupCmd.java | 4 +-
.../api/command/user/backup/DeleteBackupCmd.java | 4 +-
.../command/user/backup/ListBackupScheduleCmd.java | 1 -
.../api/command/user/backup/ListBackupsCmd.java | 2 +-
.../api/command/user/backup/RestoreBackupCmd.java | 4 +-
.../api/command/user/bucket/CreateBucketCmd.java | 2 +-
.../command/user/config/ListCapabilitiesCmd.java | 16 +
.../user/firewall/CreateEgressFirewallRuleCmd.java | 7 +-
.../user/firewall/CreateFirewallRuleCmd.java | 2 +-
.../command/user/iso/GetUploadParamsForIsoCmd.java | 2 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 2 +-
.../api/command/user/iso/ListIsosCmd.java | 2 +-
.../api/command/user/iso/RegisterIsoCmd.java | 6 +-
.../ListLoadBalancerRuleInstancesCmd.java | 4 +-
.../loadbalancer/UpdateLBHealthCheckPolicyCmd.java | 2 +-
.../loadbalancer/UpdateLBStickinessPolicyCmd.java | 2 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 2 +-
.../user/network/CreateNetworkACLListCmd.java | 2 +-
.../api/command/user/network/CreateNetworkCmd.java | 2 +-
.../routing/CreateRoutingFirewallRuleCmd.java | 2 +-
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 2 +-
.../user/resource/ListResourceLimitsCmd.java | 2 +-
.../user/resource/UpdateResourceCountCmd.java | 2 +-
.../user/resource/UpdateResourceLimitCmd.java | 4 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../AuthorizeSecurityGroupIngressCmd.java | 2 +-
.../user/securitygroup/DeleteSecurityGroupCmd.java | 2 +-
.../api/command/user/snapshot/CopySnapshotCmd.java | 6 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 5 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 2 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 6 +-
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 2 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 2 +-
.../user/storage/sharedfs/CreateSharedFSCmd.java | 2 +-
.../command/user/template/CreateTemplateCmd.java | 14 +-
.../template/GetUploadParamsForTemplateCmd.java | 4 +-
.../user/template/ListTemplatePermissionsCmd.java | 2 +-
.../command/user/template/ListTemplatesCmd.java | 2 +-
.../command/user/template/RegisterTemplateCmd.java | 4 +-
.../user/userdata/RegisterCniConfigurationCmd.java | 2 +-
.../command/user/userdata/RegisterUserDataCmd.java | 2 +-
.../api/command/user/vm/BaseDeployVMCmd.java | 6 +-
.../api/command/user/vm/CreateVMFromBackupCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 4 +-
.../api/command/user/vm/DeployVnfApplianceCmd.java | 2 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 4 +-
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 2 +-
.../api/command/user/volume/CreateVolumeCmd.java | 2 +-
.../user/volume/GetUploadParamsForVolumeCmd.java | 2 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 2 +-
.../api/command/user/vpc/CreateVPCCmd.java | 2 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 2 +-
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 2 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 2 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 2 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 2 +-
.../command/user/vpn/UpdateVpnConnectionCmd.java | 2 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/UpdateVpnGatewayCmd.java | 2 +-
.../api/response/BackupOfferingResponse.java | 19 +
.../api/response/CapabilitiesResponse.java | 10 +
.../cloudstack/api/response/DomainResponse.java | 18 +-
.../response/Site2SiteCustomerGatewayResponse.java | 16 +
.../cloudstack/api/response/SslCertResponse.java | 2 -
.../cloudstack/api/response/SystemVmResponse.java | 12 +
.../api/response/TrafficTypeResponse.java | 36 +-
.../apache/cloudstack/backup/BackupManager.java | 2 +
.../apache/cloudstack/backup/BackupProvider.java | 4 +
.../apache/cloudstack/backup/BackupService.java | 7 +
.../org/apache/cloudstack/context/CallContext.java | 12 +-
.../org/apache/cloudstack/context/LogContext.java | 8 +-
.../org/apache/cloudstack/query/QueryService.java | 2 +-
.../storage/template/VnfTemplateManager.java | 4 +-
.../storage/template/VnfTemplateUtils.java | 18 +
api/src/test/java/com/cloud/cpu/CPUTest.java | 5 +-
.../api/command/admin/config/UpdateCfgCmdTest.java | 81 ++
.../command/admin/volume/ImportVolumeCmdTest.java | 2 +-
.../offering/DomainAndZoneIdResolverTest.java | 149 +++
.../api/command/test/ScaleVMCmdTest.java | 4 -
.../user/userdata/RegisterUserDataCmdTest.java | 2 +-
client/bindir/cloud-setup-management.in | 141 ++
client/conf/server.properties.in | 5 +
client/pom.xml | 2 +-
.../java/org/apache/cloudstack/ACSRequestLog.java | 7 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 19 -
core/pom.xml | 2 +-
.../com/cloud/network/HAProxyConfigurator.java | 3 -
.../virtualnetwork/VirtualRoutingResourceTest.java | 4 -
debian/changelog | 8 +-
debian/control | 2 +-
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../service/VolumeOrchestrationService.java | 4 +-
engine/components-api/pom.xml | 2 +-
.../java/com/cloud/resource/ResourceManager.java | 5 +
.../java/com/cloud/storage/StorageManager.java | 2 +-
.../java/com/cloud/template/TemplateManager.java | 2 +
.../main/java/com/cloud/vm/VmWorkSerializer.java | 2 -
.../com/cloud/vm/snapshot/VMSnapshotManager.java | 2 +-
engine/orchestration/pom.xml | 8 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 -
.../agent/manager/ClusteredAgentManagerImpl.java | 1 -
.../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +-
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 6 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 1 -
.../engine/orchestration/VolumeOrchestrator.java | 16 +-
.../service/api/ProvisioningServiceImpl.java | 8 -
engine/pom.xml | 2 +-
engine/schema/pom.xml | 45 +-
.../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 3 -
.../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 3 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 6 -
.../network/security/dao/VmRulesetLogDaoImpl.java | 1 -
.../java/com/cloud/storage/dao/VMTemplateDao.java | 5 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 44 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 6 +-
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 6 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 48 +-
.../upgrade/SystemVmTemplateRegistration.java | 978 ++++++++------
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 2 -
.../java/com/cloud/upgrade/dao/Upgrade302to40.java | 1 -
.../com/cloud/upgrade/dao/Upgrade304to305.java | 49 -
.../com/cloud/upgrade/dao/Upgrade410to420.java | 724 +++++-----
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 9 -
.../com/cloud/upgrade/dao/Upgrade41810to41900.java | 2 +-
...grade441to442.java => Upgrade42020to42030.java} | 14 +-
...e42200to42210.java => Upgrade42210to42300.java} | 13 +-
.../main/java/com/cloud/user/UserAccountVO.java | 4 -
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 2 +-
.../backup/BackupOfferingDetailsVO.java} | 19 +-
.../apache/cloudstack/backup/BackupOfferingVO.java | 7 +
.../backup/dao/BackupOfferingDaoImpl.java | 23 +-
.../dao/BackupOfferingDetailsDao.java} | 9 +-
.../dao/BackupOfferingDetailsDaoImpl.java} | 45 +-
.../storage/datastore/db/VolumeDataStoreVO.java | 2 -
.../vm/schedule/dao/VMScheduledJobDao.java | 2 +
.../vm/schedule/dao/VMScheduledJobDaoImpl.java | 15 +
...n-daos-between-management-and-usage-context.xml | 3 +-
.../main/resources/META-INF/db/schema-307to410.sql | 2 +-
.../main/resources/META-INF/db/schema-410to420.sql | 1 -
.../resources/META-INF/db/schema-41520to41600.sql | 2 +-
...30to440-cleanup.sql => schema-42020to42030.sql} | 4 +-
.../resources/META-INF/db/schema-42200to42210.sql | 11 +
...cleanup.sql => schema-42210to42300-cleanup.sql} | 2 +-
.../resources/META-INF/db/schema-42210to42300.sql | 51 +
.../cloud/storage/dao/VMTemplateDaoImplTest.java | 87 +-
.../upgrade/SystemVmTemplateRegistrationTest.java | 1386 ++++++++++++++++++--
.../dao/BackupOfferingDetailsDaoImplTest.java | 251 ++++
engine/schema/templateConfig.sh | 23 +-
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
.../StorageCacheReplacementAlgorithmLRU.java | 1 -
engine/storage/configdrive/pom.xml | 2 +-
.../storage/configdrive/ConfigDriveBuilder.java | 4 +-
.../configdrive/ConfigDriveBuilderTest.java | 12 +-
engine/storage/datamotion/pom.xml | 2 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/SecondaryStorageServiceImpl.java | 2 +-
.../storage/image/TemplateDataFactoryImpl.java | 3 +
.../storage/image/TemplateServiceImpl.java | 44 +-
.../storage/image/TemplateServiceImplTest.java | 55 +-
engine/storage/integration-test/pom.xml | 2 +-
.../cloudstack/storage/test/VolumeServiceTest.java | 43 -
engine/storage/object/pom.xml | 2 +-
engine/storage/pom.xml | 8 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 6 +
.../snapshot/StorageSystemSnapshotStrategy.java | 2 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 48 +-
.../vmsnapshot/VMSnapshotStrategyKVMTest.java | 13 +-
.../storage/vmsnapshot/VMSnapshotStrategyTest.java | 23 +
.../allocator/AbstractStoragePoolAllocator.java | 2 +-
.../storage/endpoint/DefaultEndPointSelector.java | 2 +-
engine/storage/volume/pom.xml | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 1 -
engine/userdata/cloud-init/pom.xml | 2 +-
engine/userdata/pom.xml | 2 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 28 +-
.../config/ConfigKeyScheduledExecutionWrapper.java | 2 +-
framework/db/pom.xml | 2 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 15 +-
.../main/java/com/cloud/utils/db/GlobalLock.java | 33 +-
.../java/com/cloud/utils/db/TransactionLegacy.java | 142 +-
.../utils/db/TransactionContextBuilderTest.java | 3 -
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/extensions/pom.xml | 6 +-
framework/ipc/pom.xml | 2 +-
.../AsyncSampleEventDrivenStyleCaller.java | 15 +-
framework/jobs/pom.xml | 2 +-
.../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java | 64 -
.../framework/jobs/impl/JobSerializerHelper.java | 1 -
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/el8/cloud.spec | 2 +-
packaging/package.sh | 2 +-
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/project-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
.../non-strict-host-affinity/pom.xml | 2 +-
.../non-strict-host-anti-affinity/pom.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
.../cloudstack/ratelimit/integration/APITest.java | 1 -
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/nas/pom.xml | 2 +-
.../cloudstack/backup/NASBackupProvider.java | 12 +
.../cloudstack/backup/NASBackupProviderTest.java | 4 +
plugins/backup/networker/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 2 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
plugins/dedicated-resources/pom.xml | 2 +-
.../implicit-dedication/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/drs/cluster/balanced/pom.xml | 2 +-
plugins/drs/cluster/condensed/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/event-bus/webhook/pom.xml | 2 +-
.../org/apache/cloudstack/mom/webhook/Webhook.java | 4 +-
.../cloudstack/mom/webhook/WebhookApiService.java | 7 +
.../mom/webhook/WebhookApiServiceImpl.java | 222 +++-
.../cloudstack/mom/webhook/WebhookFilter.java | 114 ++
.../cloudstack/mom/webhook/WebhookService.java | 2 +
.../cloudstack/mom/webhook/WebhookServiceImpl.java | 128 +-
...eteWebhookCmd.java => AddWebhookFilterCmd.java} | 70 +-
.../webhook/api/command/user/CreateWebhookCmd.java | 6 +-
...WebhookCmd.java => DeleteWebhookFilterCmd.java} | 29 +-
.../command/user/ExecuteWebhookDeliveryCmd.java | 2 -
.../api/command/user/ListWebhookDeliveriesCmd.java | 2 -
...eWebhookCmd.java => ListWebhookFiltersCmd.java} | 50 +-
.../webhook/api/command/user/ListWebhooksCmd.java | 4 +-
.../webhook/api/command/user/UpdateWebhookCmd.java | 5 +-
.../api/response/WebhookFilterResponse.java | 78 +-
.../mom/webhook/dao/WebhookDeliveryDaoImpl.java | 4 +
.../{WebhookJoinDao.java => WebhookFilterDao.java} | 9 +-
.../mom/webhook/dao/WebhookFilterDaoImpl.java | 79 ++
.../cloudstack/mom/webhook/vo/WebhookFilterVO.java | 155 +++
.../webhook/spring-event-webhook-context.xml | 1 +
.../mom/webhook/WebhookApiServiceImplTest.java | 1134 +++++++++++++++-
.../mom/webhook/WebhookServiceImplTest.java | 669 ++++++++++
.../api/command/user/AddWebhookFilterCmdTest.java | 110 ++
.../command/user/DeleteWebhookDeliveryCmdTest.java | 35 +
...mdTest.java => DeleteWebhookFilterCmdTest.java} | 47 +-
.../command/user/ListWebhookFiltersCmdTest.java | 76 ++
.../mom/webhook/dao/WebhookDaoImplTest.java | 170 +++
.../webhook/dao/WebhookDeliveryDaoImplTest.java | 126 ++
.../dao/WebhookDeliveryJoinDaoImplTest.java | 129 ++
.../mom/webhook/dao/WebhookFilterDaoImplTest.java | 130 ++
.../mom/webhook/dao/WebhookJoinDaoImplTest.java | 115 ++
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../networkservice/BaremetalDhcpManagerImpl.java | 1 -
plugins/hypervisors/external/pom.xml | 2 +-
.../HypervResource/CloudStackTypes.cs | 2 +-
...OT.virtualization.v2.Msvm_EthernetSwitchPort.cs | 4 +-
....virtualization.v2.Msvm_ExternalEthernetPort.cs | 7 +-
plugins/hypervisors/hyperv/buildagent.sh | 30 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 12 +
.../kvm/resource/LibvirtDomainXMLParser.java | 4 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 214 ++-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 2 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 5 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
.../src/main/java/com/cloud/ovm/object/Test.java | 58 -
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/ovm3/sonar-project.properties | 30 +-
.../ovm3/src/test/resources/log4j.properties | 28 +-
.../src/test/resources/scripts/clean_primary.sh | 2 +-
.../src/test/resources/scripts/clean_secondary.sh | 2 +-
.../ovm3/src/test/resources/scripts/socat.sh | 30 +-
.../ovm3/src/test/resources/scripts/tail.sh | 30 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../cloud/hypervisor/vmware/VmwareCleanupMaid.java | 9 -
.../hypervisor/vmware/resource/VmwareResource.java | 4 +-
.../network/CiscoNexusVSMDeviceManagerImpl.java | 26 +-
.../storage/resource/VmwareStorageProcessor.java | 18 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 4 +-
.../resource/Xenserver625StorageProcessor.java | 4 +-
.../CitrixUpdateHostPasswordCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixRequestWrapperTest.java | 31 -
.../wrapper/xenbase/XenServer610WrapperTest.java | 11 -
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 7 +-
.../version/AddKubernetesSupportedVersionCmd.java | 2 +-
.../cluster/CreateKubernetesClusterCmd.java | 2 +-
.../ListKubernetesSupportedVersionsCmd.java | 2 +-
plugins/integrations/prometheus/pom.xml | 2 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 129 +-
plugins/maintenance/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 1 -
.../network/element/CiscoVnmcElementService.java | 2 -
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
.../java/com/cloud/network/ElasticLbVmMapVO.java | 4 -
plugins/network-elements/globodns/pom.xml | 2 +-
.../globodns/src/test/resources/log4j.properties | 26 +-
.../network-elements/internal-loadbalancer/pom.xml | 10 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 3 -
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../api/command/CreateServiceInstanceCmd.java | 2 +-
.../contrail/management/ManagementServerMock.java | 37 +-
.../contrail/management/MockAccountManager.java | 8 +-
plugins/network-elements/netris/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/network-elements/nsx/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/tungsten/pom.xml | 2 +-
.../tungsten/service/TungstenElementTest.java | 54 -
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/object/ceph/pom.xml | 2 +-
plugins/storage/object/cloudian/pom.xml | 2 +-
plugins/storage/object/minio/pom.xml | 2 +-
plugins/storage/object/simulator/pom.xml | 2 +-
plugins/storage/sharedfs/storagevm/pom.xml | 2 +-
plugins/storage/volume/adaptive/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
.../driver/ElastistorPrimaryDataStoreDriver.java | 3 -
.../storage/datastore/util/ElastistorUtil.java | 9 -
plugins/storage/volume/datera/pom.xml | 2 +-
.../driver/DateraPrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/DateraHostListener.java | 4 +-
plugins/storage/volume/default/pom.xml | 2 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
.../storage/datastore/util/LinstorUtilTest.java | 1 -
plugins/storage/volume/nexenta/pom.xml | 2 +-
.../driver/NexentaPrimaryDataStoreDriver.java | 3 -
.../datastore/util/NexentaStorApplianceTest.java | 1 -
plugins/storage/volume/primera/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../storage/datastore/api/VTreeMigrationInfo.java | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/SolidFireHostListener.java | 4 +-
.../apache/cloudstack/storage/test/VolumeTest.java | 12 -
plugins/storage/volume/storpool/pom.xml | 2 +-
.../StorPoolDownloadVolumeCommandWrapper.java | 1 -
.../collector/StorPoolAbandonObjectsCollector.java | 1 -
.../driver/StorPoolPrimaryDataStoreDriver.java | 3 +-
.../storage/datastore/util/StorPoolHelper.java | 26 -
plugins/user-authenticators/ldap/pom.xml | 10 +-
.../api/command/LdapAddConfigurationCmd.java | 2 +-
.../api/command/LdapCreateAccountCmd.java | 13 +-
.../api/command/LdapDeleteConfigurationCmd.java | 4 +-
.../cloudstack/api/command/LdapImportUsersCmd.java | 31 +-
.../api/command/LdapListConfigurationCmd.java | 16 +-
.../cloudstack/api/command/LdapListUsersCmd.java | 112 +-
.../cloudstack/api/command/LdapUserSearchCmd.java | 4 +-
.../api/command/LinkAccountToLdapCmd.java | 14 +-
.../api/command/LinkDomainToLdapCmd.java | 14 +-
.../api/command/UnlinkDomainFromLdapCmd.java | 69 +
.../api/response/LinkAccountToLdapResponse.java | 4 +
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 6 +-
.../apache/cloudstack/ldap/LdapAuthenticator.java | 27 +-
.../apache/cloudstack/ldap/LdapConfiguration.java | 88 +-
.../apache/cloudstack/ldap/LdapContextFactory.java | 14 +-
.../org/apache/cloudstack/ldap/LdapManager.java | 7 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 155 ++-
.../org/apache/cloudstack/ldap/LdapTrustMapVO.java | 4 +-
.../java/org/apache/cloudstack/ldap/LdapUser.java | 2 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 18 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 34 +-
.../cloudstack/ldap/dao/LdapConfigurationDao.java | 6 +-
.../ldap/dao/LdapConfigurationDaoImpl.java | 6 -
.../api/command/LdapListUsersCmdTest.java | 4 +-
.../api/command/LinkAccountToLdapCmdTest.java | 1 +
.../cloudstack/ldap/ADLdapUserManagerImplTest.java | 44 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/oauth2/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 3 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 9 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../static-pin/pom.xml | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
pom.xml | 16 +-
quickcloud/pom.xml | 2 +-
scripts/installer/createtmplt.sh | 5 -
scripts/installer/createvolume.sh | 5 -
scripts/storage/multipath/connectVolume.sh | 2 +-
scripts/storage/multipath/resizeVolume.sh | 2 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 1 +
scripts/storage/secondary/listvmtmplt.sh | 5 -
scripts/storage/secondary/listvolume.sh | 5 -
scripts/storage/secondary/setup-sysvm-tmplt | 1 +
scripts/util/keystore-setup | 2 +-
scripts/vm/hypervisor/kvm/nasbackup.sh | 33 +-
scripts/vm/hypervisor/kvm/nsrkvmbackup.sh | 33 +-
scripts/vm/hypervisor/kvm/nsrkvmrestore.sh | 33 +-
scripts/vm/hypervisor/ovm3/cloudstack.py | 4 -
scripts/vm/hypervisor/xenserver/perfmon.py | 6 -
scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py | 14 -
scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py | 15 -
.../vm/hypervisor/xenserver/xenserver56/NFSSR.py | 14 -
.../hypervisor/xenserver/xenserver56fp1/NFSSR.py | 15 -
.../vm/hypervisor/xenserver/xenserver60/NFSSR.py | 14 -
scripts/vm/network/ovs-pvlan-kvm-vm.sh | 2 +-
scripts/vm/network/ovs-pvlan-vm.sh | 2 +-
scripts/vm/network/security_group.py | 241 ++--
scripts/vm/network/vnet/ovstunnel.py | 9 -
server/pom.xml | 4 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 33 +
.../manager/allocator/impl/FirstFitAllocator.java | 2 +-
.../allocator/impl/UserConcentratedAllocator.java | 2 -
.../java/com/cloud/alert/AlertManagerImpl.java | 3 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 10 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 512 ++++----
server/src/main/java/com/cloud/api/ApiServer.java | 16 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 34 +-
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 2 -
.../java/com/cloud/api/query/QueryManagerImpl.java | 47 +-
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 10 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 79 +-
.../main/java/com/cloud/configuration/Config.java | 36 +-
.../configuration/ConfigurationManagerImpl.java | 70 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 7 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 6 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 172 ++-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 4 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 2 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 14 -
.../java/com/cloud/network/NetworkModelImpl.java | 16 -
.../java/com/cloud/network/NetworkServiceImpl.java | 12 +
.../com/cloud/network/as/AutoScaleManager.java | 5 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 46 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 6 +-
.../cloud/network/router/NetworkHelperImpl.java | 2 -
.../router/VirtualNetworkApplianceManager.java | 6 -
.../router/VirtualNetworkApplianceManagerImpl.java | 14 +-
.../cloud/network/rules/PrivateGatewayRules.java | 1 -
.../com/cloud/network/rules/RulesManagerImpl.java | 4 +-
.../network/security/SecurityGroupManagerImpl.java | 1 -
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 33 +-
.../com/cloud/network/vpn/Site2SiteVpnManager.java | 6 +
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 279 +++-
.../com/cloud/resource/ResourceManagerImpl.java | 24 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 5 +
.../com/cloud/server/ConfigurationServerImpl.java | 2 -
.../com/cloud/server/ManagementServerImpl.java | 80 +-
.../main/java/com/cloud/server/StatsCollector.java | 4 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 118 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 4 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 8 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 3 +-
.../cloud/storage/snapshot/SnapshotManager.java | 4 +-
.../cloud/template/HypervisorTemplateAdapter.java | 12 +-
.../com/cloud/template/TemplateManagerImpl.java | 20 +
.../main/java/com/cloud/test/IPRangeConfig.java | 36 +-
.../main/java/com/cloud/test/PodZoneConfig.java | 6 -
.../java/com/cloud/user/AccountManagerImpl.java | 18 +-
.../main/java/com/cloud/utils/DomainHelper.java | 63 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 +-
.../affinity/AffinityGroupServiceImpl.java | 22 +-
.../cloudstack/backup/BackupManagerImpl.java | 117 +-
.../direct/download/DirectDownloadManagerImpl.java | 2 +-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 12 +-
.../cloudstack/storage/NfsMountManagerImpl.java | 1 -
.../storage/template/VnfTemplateManagerImpl.java | 21 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 5 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 8 +-
.../core/spring-server-core-misc-context.xml | 2 +
.../test/java/com/cloud/acl/DomainCheckerTest.java | 45 +
server/src/test/java/com/cloud/api/APITest.java | 1 -
.../java/com/cloud/api/ApiResponseHelperTest.java | 85 +-
.../test/java/com/cloud/api/ApiServletTest.java | 71 +-
.../ConfigurationManagerImplTest.java | 41 +
.../cloud/network/as/AutoScaleManagerImplTest.java | 74 +-
.../network/vpn/Site2SiteVpnManagerImplTest.java | 944 +++++++++++++
.../cloud/resource/ResourceManagerImplTest.java | 14 +-
.../ResourceLimitManagerImplTest.java | 1 +
.../com/cloud/storage/StorageManagerImplTest.java | 56 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 15 -
.../template/HypervisorTemplateAdapterTest.java | 27 +-
.../cloud/template/TemplateManagerImplTest.java | 28 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 37 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 7 +
.../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 17 +-
.../test/java/com/cloud/vpc/Site2SiteVpnTest.java | 75 --
.../java/com/cloud/vpc/VpcTestConfiguration.java | 5 -
.../cloudstack/affinity/AffinityApiUnitTest.java | 2 +-
.../affinity/AffinityGroupServiceImplTest.java | 2 +-
.../cloudstack/backup/BackupManagerTest.java | 366 +++++-
.../consoleproxy/ConsoleAccessManagerImplTest.java | 26 -
.../network/RoutedIpv4ManagerImplTest.java | 4 +-
.../networkoffering/CreateNetworkOfferingTest.java | 6 +-
.../template/VnfTemplateManagerImplTest.java | 8 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
.../rdpconsole/src/main/java/common/Client.java | 31 +-
.../main/java/common/adapter/AwtCanvasAdapter.java | 6 -
.../src/main/java/rdpclient/RdpClient.java | 9 -
.../java/rdpclient/clip/ClipboardDataFormat.java | 14 -
.../java/rdpclient/ntlmssp/asn1/TSRequest.java | 6 -
.../java/rdpclient/rdp/ClientConfirmActivePDU.java | 2 +-
.../rdpclient/rdp/ClientMCSAttachUserRequest.java | 2 -
...nnelJoinRequestServerMCSChannelConfirmPDUs.java | 5 -
.../java/rdpclient/rdp/ClientSynchronizePDU.java | 2 -
.../java/rdpclient/rdp/ServerBitmapUpdate.java | 1 -
.../java/rdpclient/rdp/ServerDemandActivePDU.java | 11 +-
.../java/rdpclient/rdp/ServerIOChannelRouter.java | 6 -
.../src/main/java/rdpclient/rdp/ServerMCSPDU.java | 4 -
.../src/main/java/streamer/BaseElement.java | 1 -
.../src/main/java/streamer/PipelineImpl.java | 3 -
.../rdpconsole/src/main/java/streamer/Queue.java | 1 -
.../src/main/java/streamer/debug/MockSource.java | 1 -
.../java/vncclient/vnc/Vnc33Authentication.java | 2 -
.../src/main/java/vncclient/vnc/Vnc33Hello.java | 2 -
.../main/java/vncclient/vnc/VncInitializer.java | 2 -
.../main/java/vncclient/vnc/VncMessageHandler.java | 2 -
services/console-proxy/server/pom.xml | 2 +-
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 1 -
.../consoleproxy/ConsoleProxyThumbnailHandler.java | 2 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 8 +-
.../SecondaryStorageManagerImpl.java | 4 -
.../SecondaryStorageManagerTest.java | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 4 -
.../storage/template/DownloadManagerImpl.java | 2 -
.../storage/template/UploadManagerImpl.java | 1 -
.../LocalNfsSecondaryStorageResourceTest.java | 1 -
setup/dev/s3.cfg | 29 +-
systemvm/agent/conf/environment.properties | 17 +
systemvm/agent/scripts/run-proxy.sh | 12 -
systemvm/agent/scripts/ssvm-check.sh | 2 +-
systemvm/debian/etc/haproxy/haproxy.cfg | 17 +
systemvm/debian/opt/cloud/bin/baremetal_snat.sh | 28 +-
systemvm/debian/opt/cloud/bin/dnsmasq.sh | 2 +
systemvm/debian/opt/cloud/bin/loadbalancer.sh | 4 +-
systemvm/debian/opt/cloud/bin/prepare_pxe.sh | 5 +-
.../opt/cloud/bin/update_interface_config.sh | 2 +-
systemvm/pom.xml | 2 +-
.../component/test_base_image_updation.py | 2 +-
test/integration/component/test_egress_rules.py | 4 +-
.../component/test_escalations_ipaddresses.py | 4 +-
.../test_multiple_subnets_in_isolated_network.py | 4 +-
...est_multiple_subnets_in_isolated_network_rvr.py | 4 +-
.../component/test_multiple_subnets_in_vpc.py | 4 +-
.../component/test_multiple_subnets_in_vpc_rvr.py | 4 +-
.../integration/component/test_netscaler_nw_off.py | 6 +-
test/integration/component/test_stopped_vm.py | 2 +-
.../component/test_vpc_vm_life_cycle.py | 2 +-
.../plugins/storpool/MigrateVolumeToStorPool.py | 2 +-
.../plugins/storpool/TestEncryptedVolumes.py | 2 +-
.../plugins/storpool/TestStorPoolVolumes.py | 2 +-
.../plugins/storpool/TestTagsOnStorPool.py | 2 +-
.../plugins/storpool/TestVmSnapshots.py | 2 +-
.../smoke/test_network_traffic_type_api.py | 73 ++
test/integration/smoke/test_vm_snapshots.py | 2 +-
test/integration/smoke/test_volumes.py | 2 +-
test/integration/smoke/test_webhook_lifecycle.py | 2 +-
.../testpaths/testpath_storage_migration.py | 8 +-
test/pom.xml | 2 +-
test/scripts/deploycluster.sh | 2 +-
tools/apidoc/pom.xml | 2 +-
tools/checkstyle/pom.xml | 2 +-
.../devcloud-kvm/devcloud-kvm-advanced-fusion.cfg | 30 +-
tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 30 +-
tools/devcloud-kvm/devcloud-kvm.cfg | 30 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/advanced/marvin.cfg | 30 +-
tools/devcloud4/basic/marvin.cfg | 30 +-
tools/devcloud4/common/configure-network.sh | 34 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/docker/docker-compose.yml | 6 +-
tools/marvin/marvin/lib/base.py | 3 +-
tools/marvin/marvin/misc/build/configure.py | 2 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/ngui/precache.py | 2 +-
tools/pom.xml | 2 +-
ui/public/locales/de_DE.json | 2 +-
ui/public/locales/el_GR.json | 2 +-
ui/public/locales/en.json | 61 +-
ui/public/locales/ja_JP.json | 2 +-
ui/public/locales/ko_KR.json | 2 +-
ui/public/locales/pt_BR.json | 11 +-
ui/public/locales/te.json | 3 +-
ui/public/locales/zh_CN.json | 2 +-
ui/src/assets/icons/kubernetes.svg | 1 +
ui/src/components/header/CreateMenu.vue | 6 +-
ui/src/components/view/DateTimeFilter.vue | 10 +-
ui/src/components/view/DedicateDomain.vue | 2 +-
ui/src/components/view/DeployVMFromBackup.vue | 23 +-
ui/src/components/view/DetailsTab.vue | 4 +-
ui/src/components/view/GPUDevicesTab.vue | 10 +-
ui/src/components/view/GPUSummaryTab.vue | 11 +-
ui/src/components/view/GPUTab.vue | 10 +-
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/components/view/ListView.vue | 22 +-
ui/src/components/view/ResourceCountUsage.vue | 10 +-
ui/src/components/view/ResourceLimitTab.vue | 10 +-
ui/src/components/view/SettingsTab.vue | 10 +-
ui/src/components/view/StatsTab.vue | 68 +-
ui/src/components/view/TestWebhookDeliveryView.vue | 12 +-
ui/src/components/view/VgpuProfilesTab.vue | 10 +-
ui/src/components/view/WebhookFiltersTab.vue | 416 ++++++
ui/src/components/view/stats/ResourceStatsInfo.vue | 10 +-
.../view/stats/ResourceStatsLineChart.vue | 10 +-
ui/src/config/section/compute.js | 3 +-
ui/src/config/section/domain.js | 16 +-
ui/src/config/section/image.js | 3 +-
ui/src/config/section/infra/systemVms.js | 2 +-
ui/src/config/section/network.js | 15 +-
ui/src/config/section/offering.js | 6 +-
ui/src/config/section/tools.js | 4 +
ui/src/utils/plugins.js | 16 +-
ui/src/utils/renderIcon.js | 5 +-
ui/src/views/compute/AttachIso.vue | 4 +-
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 12 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 16 +-
ui/src/views/compute/DeployVnfAppliance.vue | 32 +-
ui/src/views/compute/EditVM.vue | 4 +-
ui/src/views/compute/ReinstallVm.vue | 10 +-
.../views/compute/wizard/OsBasedImageSelection.vue | 4 +-
ui/src/views/compute/wizard/VnfNicsSelection.vue | 5 +
ui/src/views/extension/CreateExtension.vue | 6 +-
ui/src/views/extension/UpdateCustomAction.vue | 4 +-
ui/src/views/iam/AddAccount.vue | 85 +-
ui/src/views/iam/CreateRole.vue | 2 +-
ui/src/views/iam/ImportRole.vue | 2 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +-
ui/src/views/infra/ClusterUpdate.vue | 4 +
ui/src/views/infra/Resources.vue | 10 +-
ui/src/views/infra/routers/RouterHealthCheck.vue | 4 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 3 +
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 2 +-
.../infra/zone/ZoneWizardRegisterTemplate.vue | 2 +-
ui/src/views/network/CreateVpnCustomerGateway.vue | 360 +----
ui/src/views/network/UpdateVpnCustomerGateway.vue | 129 ++
ui/src/views/network/VnfAppliancesTab.vue | 2 +-
ui/src/views/network/VpnCustomerGateway.vue | 581 ++++++++
ui/src/views/offering/AddComputeOffering.vue | 6 +-
ui/src/views/offering/AddNetworkOffering.vue | 1 +
ui/src/views/offering/AddVpcOffering.vue | 1 +
ui/src/views/offering/ImportBackupOffering.vue | 69 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 2 +-
ui/src/views/setting/ConfigurationHierarchy.vue | 5 +-
ui/src/views/setting/ConfigurationTab.vue | 13 +-
ui/src/views/setting/ConfigurationTable.vue | 8 +-
ui/src/views/setting/ConfigurationValue.vue | 14 +-
.../storage/ChangeSharedFSServiceOffering.vue | 2 +-
ui/src/views/storage/FormSchedule.vue | 8 +-
ui/src/views/storage/SnapshotZones.vue | 7 +-
ui/src/views/storage/TakeSnapshot.vue | 10 +-
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
utils/src/main/java/com/cloud/utils/EnumUtils.java | 26 -
.../java/com/cloud/utils/rest/BasicRestClient.java | 2 +-
.../main/java/com/cloud/utils/script/Script.java | 22 +
.../java/com/cloud/utils/xmlobject/XmlObject.java | 3 -
.../com/cloud/utils/xmlobject/XmlObjectParser.java | 4 -
.../utils/server/ServerPropertiesUtil.java | 58 +
.../utils/server/ServerPropertiesUtilTest.java | 95 ++
vmware-base/pom.xml | 2 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 4 -
796 files changed, 14598 insertions(+), 5479 deletions(-)
copy debian/cloudstack-marvin.postinst => .github/CODEOWNERS (84%)
mode change 100755 => 100644
rename .github/ISSUE_TEMPLATE/{feature_request.yaml => feature_request.yml}
(100%)
copy agent/conf/environment.properties.in => .github/dependabot.yml (59%)
rename .github/workflows/{linter.yml => pre-commit.yml} (90%)
create mode 100644 .github/workflows/stale.yml
rename PRE-COMMIT.md => PRE_COMMIT.md (97%)
create mode 100644
api/src/main/java/com/cloud/agent/api/to/VirtualMachineMetadataTO.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/offering/DomainAndZoneIdResolver.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/offering/DomainAndZoneIdResolverTest.java
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade441to442.java
=> Upgrade42020to42030.java} (82%)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42200to42210.java =>
Upgrade42210to42300.java} (86%)
copy
engine/schema/src/main/java/{com/cloud/network/vpc/VpcOfferingDetailsVO.java =>
org/apache/cloudstack/backup/BackupOfferingDetailsVO.java} (79%)
copy
engine/schema/src/main/java/org/apache/cloudstack/{resourcedetail/dao/DiskOfferingDetailsDao.java
=> backup/dao/BackupOfferingDetailsDao.java} (73%)
copy
engine/schema/src/main/java/org/apache/cloudstack/{resourcedetail/dao/DiskOfferingDetailsDaoImpl.java
=> backup/dao/BackupOfferingDetailsDaoImpl.java} (53%)
copy engine/schema/src/main/resources/META-INF/db/{schema-430to440-cleanup.sql
=> schema-42020to42030.sql} (86%)
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql
=> schema-42210to42300-cleanup.sql} (93%)
create mode 100644
engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
create mode 100644
engine/schema/src/test/java/org/apache/cloudstack/backup/dao/BackupOfferingDetailsDaoImplTest.java
create mode 100644
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookFilter.java
copy
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookCmd.java
=> AddWebhookFilterCmd.java} (60%)
copy
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookCmd.java
=> DeleteWebhookFilterCmd.java} (79%)
copy
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookCmd.java
=> ListWebhookFiltersCmd.java} (65%)
copy
api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java
=>
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/response/WebhookFilterResponse.java
(51%)
copy
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/{WebhookJoinDao.java
=> WebhookFilterDao.java} (71%)
create mode 100644
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookFilterDaoImpl.java
create mode 100644
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookFilterVO.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookServiceImplTest.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/AddWebhookFilterCmdTest.java
copy
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookDeliveryCmdTest.java
=> DeleteWebhookFilterCmdTest.java} (78%)
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/ListWebhookFiltersCmdTest.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDaoImplTest.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryDaoImplTest.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryJoinDaoImplTest.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookFilterDaoImplTest.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookJoinDaoImplTest.java
create mode 100644
plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java
create mode 100644 server/src/main/java/com/cloud/utils/DomainHelper.java
create mode 100644
server/src/test/java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java
delete mode 100644 server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java
create mode 100644 test/integration/smoke/test_network_traffic_type_api.py
create mode 100644 ui/src/assets/icons/kubernetes.svg
create mode 100644 ui/src/components/view/WebhookFiltersTab.vue
create mode 100644 ui/src/views/network/UpdateVpnCustomerGateway.vue
create mode 100644 ui/src/views/network/VpnCustomerGateway.vue
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/server/ServerPropertiesUtil.java
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/server/ServerPropertiesUtilTest.java
