This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch fix-ldapconf-list-pagination
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 41b92dd65eb fix ui
discard f3329be397c API: Fix pagination issue with listing LDAP configuration
add 2944bd1eda1 API: Set Object name when expunging VM (#11352)
add 3850445b505 ui: fix delete traffic type (#11337)
add 6589235b718 Merge branch '4.19' into 4.20
add ed0d606e983 Find system VM templates for CKS clusters and SharedFS
honouring the preferred architecture (#10946)
add 742e131283a Update System VM template Guest OS version (#11291)
add 1bfebd550ce ui: update project menu on projects change (#11369)
add 14feb259f61 Merge branch '4.19' into 4.20
add 58484fb44dd cloud.spec: provide option between tzdata-java and
timezone-java (#11372)
add 626f3de69ad Handle project delete in detailsview. (#11197)
add cda3640be15 juniper-contrail: publish events only for the module
(#11373)
add 3134efb971d plugin-swift: handle null cache store (#11380)
add a0fd37f4955 ui: pass validated storagepolicy for swift store (#11315)
add de5188e50c8 fix storage pool capacity threshold flag (#11366)
add 7acd5a38756 Merge branch '4.19' into 4.20
add a2d35c8ac21 Fix imports
add 53bc435bdb1 Fix create statement for safer upgrades (#11388)
add b9864cb1e1c server: fix vm deployment without networkid in a zone with
shared networks (#11242)
add 56b97f8255b Merge branch '4.19' into 4.20
add 78e146278b3 api: fix scale or upgrade systemvm (#11062)
add bd252b59836 Merge branch '4.19' into 4.20
add f5b4858012b ui: make vpc cidr required when not showing cidrsize
(#11393)
add d4bd5872313 UI: fix addHost in zone wizard (#11401)
add 25f93b1d6b8 linstor: fix getVolumeStats if multiple Linstor primary
storages are used (#11397)
add 9111bbd8da6 Merge branch '4.19' into 4.20
add c6daeb4f78d fix snapshot physical size for primary storage (#11448)
add df5efa5d0dc Remove non-existant network service provider from UI
(#11463)
add 6e59f4f4cc2 Fix deployment of CKS clusters in Basic zone (#11457)
add 0f0155c6530 Fix live migration of VM with config drive on KVM (#11516)
add f80a9ca4823 UI: Prevent restriction of changeOfferingForVolume API to
Admin role (#11466)
add 05e7a257ca5 VPC VR: return UNKNOWN redundant state if no guest nics
(#11518)
add ba7ec886504 SG: Apply rules for both ipv4/ipv6 of VMs with associated
account/SG (#11243)
add 3109e0080e5 Add response object required by go SDK for parsing
response (#10152)
add ca62a7dd504 Merge branch '4.19' into 4.20
add 762f75c041d kvm: fix vm deployment with direct-download iso (#11532)
add d161dc76699 api: use single quote instead of double quote in
StatsResponse (#11537)
add 5837c4f29e2 Merge remote-tracking branch 'apache/4.19' into 4.20
add 92e75932967 Use update offering APIs to disable compute and disk
offerings (#11550)
add 48648d4c45b test: fix test_04_rvpc_network_garbage_collector_nics
failure (#11542)
add 973b333e401 Merge remote-tracking branch 'apache/4.19' into 4.20
add f24b1757a0b ui: donot filter edge zones while registering
directdownload iso (#10865)
add 25f1d203403 ui: show multiple domains as links in list view (#11536)
add db5b6a54a1e systemvm template: update URLs of debian ISOs (#11543)
add adec5f439df kvm: add ssvm storage nic null uri check during plug
(#11557)
add af2a911f1b7 UI: Make logout function more robust to prevent session
issues (#11361)
add 90681df1b5b Primera: Delete session after key expiration (#11487)
add fd46e61032f Added events for snapshots, vmsnapshots, internalLB
operations (#11230)
add a4cf47a9b80 server: remove extra chars when template status is error
string (#11329)
add f4802f30ed6 UI: fix display of disk size and IOPS fields in the scale
VM form (#11553)
add f99942cf9a2 Merge remote-tracking branch 'apache/4.19' into 4.20
add 6868f052de4 2fa: log error on totp mismatch (#10734)
add 9349b69b7e6 server,kvm: detect boot options for vm import (#11218)
add 3ffd4442946 ui: donot remove account, domain from query on public ip
filter change (#11575)
add 4f5f7d46d28 CKS: Validate network offering from network if provided
rather than global setting (#11528)
add f26f8cce178 server: allow adding non-overlapping ipv6 ranges in same
vlan (#11556)
add fe120b64e70 server: prevent vm schedule update failure for time when
not changed (#11314)
add 7044564bab1 Merge remote-tracking branch 'apache/4.19' into 4.20
add e3681a04bb8 server: allow migration of vm with snapshots for vmware
(#9305)
add 5d32492676a IPv6 firewall: accept packets from related and established
connections (#10970)
add e64e94ad3f7 Import KVM VM: Autodetect vlan id from bridge name (#11507)
add 036fd001705 kvm: Fix NPE in case host UEFI detail is not set on agent
connection (#11610)
add 7c727a34406 CKS: Fix transition exception when scaling Stopped k8s
clusters (#11598)
add 38006b2e03d ssvm: use mgmt network if no storage network (#10735)
add 253ac036214 Management server: fix qemu-img path in cloudstack sudoers
(#11614)
add 6d16ac2113a ScaleIO/PowerFlex smoke tests improvements, and some fixes
(#11554)
add 2cd7d8a315e server: check limit on correct store during snapshot
allocation (#11558)
add 7c76a3c12a8 ui: searchview change should only remove related query
params (#11576)
add cd69f2ce16d server: Fix NPE during VM IP fetch for shared networks
(#11389)
add 2e113e5ed70 Change log level of AgentHandler#processRequest() (#10869)
add 7c7497c6248 Merge remote-tracking branch 'apache/4.19' into 4.20
add 6a145358a92 ui: fix tab name in query params (#11590)
add 1948f90c2c7 [UI] Fix group disable action for compute and disk
offering (#11602)
add 0cbebbdddda kvm: Fix for No VMs start after Renew Host Security Keys
due to wrong qemu group reading (#11632)
add 9167cd3b722 server: use /prod/stat to get uptime instead of the uptime
command (#11670)
add 393b5d2b779 VR: consider NICs for remote access VPN when apply dhcp
entry (#11681)
add 12513e18fa3 server: Update gson date format for
serializing/deserializing Date in MS stats (#11506)
add 40dec996591 server: Cleanup allocated snapshots / vm snapshots, and
update pending ones to Error on MS start (#8452)
add 1a223fd2bac server: Fix VM import DB sequence issue on import failure
(#11659)
add a749206eb8e storage: Mount disabled pools by default when host is
booted (#11666)
add a18b5514e67 kvm: honor templateId passed in importVM API (#11640)
add 98b9af29040 server: set VirtualMachineTO arch from template if present
(#11530)
add 96992d3d640 server: Fix vpclimit count for listAcccount API response
(#11686)
add c24d2b88f6b LDAP: honour nested groups for MSAD (#11696)
add 36cfd76ce19 KVM: fix delete vm snapshot if it does not exist with a
Stopped vm (#11687)
add 318a4f2b6ec server: set download volume format to qcow2 for KVM
volumes (#11198)
add 5dfeb79c63c systemvm: fix failed to get script version when patch
system vm or router (#10962)
add 30cb8c7a820 Fix importing unmanaged instances due to incorrect
internal name (#11753)
add 70af55e8489 UI support for extraconfig in deploy and update instance
(#11719)
add c631d6a480d CKS: generate a random UUID as password of CKS user in
project (#11639)
add ca7138b3bdf server: Consider Instance in Starting state as well for
allocation algorithm (#11751)
add e12813de497 CKS: fix CKS creation on an existing Shared and Routed
network (#11735)
add 8e4dc0a66d2 VMware: match nic mac for ip address fetch (#10641)
add 963a67b8167 server: add user.password.reset.smtp.useStartTLS and
enabledSecurityProtocols for password reset (#11228)
add 823cb00a0a0 server: do not enable the disabled local storage(s) on
host connection during mgmt server / agent start (#11722)
add a208db54ea8 linstor: use sparse/discard qemu-img convert on thin
devices (#11787)
add aca82359606 Merge branch '4.19' into 4.20
add 314c4591ecb systemvmtemplate: Bump Debian version to 12.12.0 (#11778)
add 270d3f9a2da UI: Deal with crosssite api call after login (#10533)
add 9f20979bcee UI: Fix primary storage for datastore cluster and retain
traffic labels during zone deployment (#11760)
add b143ddc4058 Sanitize the rbd file cmd parameter logs during qemu-img
convert (through Script) (#11801)
add 89d2b17461f storage: change storage pool to Up state when cancel
storage migration (#11773)
add 309b444205a pom.xml: update jetty version (#11793)
add 4d95f08a3ab Delete template from storage pool instantly if no volume
is using it (#11782)
add 86cad79c156 importvm: fix IP address allocation on Shared networks
(#11811)
add 6f931dbd005 agent: increase timeout for host arch retrieval (#11254)
(#11822)
add 43278710362 Routed: fix create network exception when auto-allocation
is disabled (#11624)
add b82369c2415 systemvm: fix duplicated "en_US.UTF-8 UTF-8" in
/etc/locale.gen (#11823)
add eee43e534fa cloudutils: fix warning, error during kvm agent
installation (#11318)
add c8d44d92a76 api,server: fix entity access
add 03a4b9f4fd3 server,utils: improve js interpretation functionality
add a6068a850cd Update CI workflow to use Ubuntu 24.04 (#11873)
add a839e25d559 Fix OOB test failures in ci.yml github actions (#11887)
add 4dc3931233b Updating pom.xml version numbers for release 4.20.2.0
add 15d2137800b Merge tag '4.20.2.0' into 4.20
add e333ce9782d Updating pom.xml version numbers for release
4.20.3.0-SNAPSHOT
add 255c4615dd9 Fix VMScheduler unit test for daylight saving time (#11907)
add e90e436ef87 UI: Enable listall (for Affinity Groups, SSH Keypairs,
User Data) in deploy instance wizard for admin, and lists SSH Keypairs, User
Data by domain/account (#11906)
add d53b6dbda42 api/test: fix storage pool update with only id (#11897)
add 8230f04a790 CKS: update cloud.kubernetes.cluster.network.offering to
dynamic (#11847)
add c5c3cc40c1e consider Instance in Starting state for
listPodsByUserConcentration (#11845)
add 2954e969475 Veeam: get templateId from vm instance if vm is created
from ISO (#10705)
add d26122bf22b Veeam: use pre-defined object mapper (#10715)
add 81787b310ee fix API Request Parameters Logged Credential Masking in
ApiServer (#12020)
add f0a0936675c server: fix volume offering not updated after offering
change (#12003)
add 028dd869456 fixed Password Exposure in IPMI Tool Command Execution
(#12028)
add f379d789635 ui: fix section search filter (#12146)
add 44119cf34fc ui: fix dsiple managementservermetricsresponse -
agentcount (#12148)
add 243f566a603 refactor: add null check for BroadcastDomainType
retrievals (#11572)
add e4414d1c449 Fix agent wait before reconnect (#12153)
add 951649c420a Support iprange while creating remote access vpn (#12063)
add ba52db9b3e9 ui: allow macaddress input for add nic to vm (#12145)
add 43483869705 Optimize drs plan generation (#12014)
add 79ebf6959e1 refactor storapool automation (#11789)
add 6bb9dff72de API: Fix pagination issue with listing LDAP configuration
add 6f432d1f199 fix ui
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (41b92dd65eb)
\
N -- N -- N refs/heads/fix-ldapconf-list-pagination (6f432d1f199)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/ci.yml | 24 +-
agent/pom.xml | 2 +-
agent/src/main/java/com/cloud/agent/Agent.java | 16 +-
api/pom.xml | 2 +-
.../main/java/com/cloud/hypervisor/Hypervisor.java | 6 +-
api/src/main/java/com/cloud/network/Networks.java | 12 +-
.../java/com/cloud/server/ManagementService.java | 29 +-
.../java/com/cloud/server/ResourceManagerUtil.java | 1 +
api/src/main/java/com/cloud/vm/UserVmService.java | 26 +-
.../com/cloud/vm/snapshot/VMSnapshotService.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/acl/project/ListProjectRolesCmd.java | 2 +-
.../admin/storage/UpdateStoragePoolCmd.java | 2 +
.../command/admin/systemvm/ScaleSystemVMCmd.java | 2 +-
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 2 +-
.../command/user/config/ListCapabilitiesCmd.java | 1 +
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 5 +
.../api/command/user/vm/DestroyVMCmd.java | 3 +-
.../cloudstack/api/response/AccountResponse.java | 2 +-
.../api/response/CapabilitiesResponse.java | 8 +
.../cloudstack/api/response/StatsResponse.java | 2 +-
.../cloudstack/cluster/ClusterDrsAlgorithm.java | 198 +--
.../test/java/com/cloud/network/NetworksTest.java | 18 +
client/pom.xml | 2 +-
core/pom.xml | 2 +-
debian/changelog | 12 +
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../subsystem/api/storage/SnapshotDataFactory.java | 3 +
.../subsystem/api/storage/VMSnapshotStrategy.java | 3 +
engine/components-api/pom.xml | 2 +-
.../java/com/cloud/storage/StorageManager.java | 4 +-
.../java/com/cloud/template/TemplateManager.java | 9 +
.../com/cloud/vm/snapshot/VMSnapshotManager.java | 1 -
engine/orchestration/pom.xml | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 6 +-
.../engine/orchestration/NetworkOrchestrator.java | 22 +-
.../engine/orchestration/VolumeOrchestrator.java | 25 +-
.../orchestration/NetworkOrchestratorTest.java | 2 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
.../network/security/SecurityGroupVMMapVO.java | 7 +
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 11 +-
.../com/cloud/storage/dao/VMTemplatePoolDao.java | 2 +
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 10 +
.../upgrade/SystemVmTemplateRegistration.java | 63 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 6 +-
.../com/cloud/vm/snapshot/dao/VMSnapshotDao.java | 2 +
.../storage/datastore/db/PrimaryDataStoreDao.java | 2 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 14 +
.../resources/META-INF/db/schema-41910to42000.sql | 2 +-
.../cloud/storage/dao/VMTemplateDaoImplTest.java | 21 +
.../upgrade/SystemVmTemplateRegistrationTest.java | 10 +-
engine/schema/templateConfig.sh | 12 +-
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
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 +-
engine/storage/object/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 22 +-
.../storage/snapshot/SnapshotObject.java | 11 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 10 +
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 10 +
.../volume/datastore/PrimaryDataStoreHelper.java | 4 +-
engine/storage/volume/pom.xml | 2 +-
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 +-
framework/db/pom.xml | 2 +-
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 55 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 4 +-
.../cloudstack/quota/QuotaManagerImplTest.java | 4 +-
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 | 4 +-
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 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/nas/pom.xml | 2 +-
plugins/backup/networker/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/veeam/VeeamClient.java | 45 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 4 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
.../api/response/QuotaResponseBuilderImpl.java | 23 +-
.../org/apache/cloudstack/quota/QuotaService.java | 12 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 9 +
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 +-
.../org/apache/cloudstack/cluster/Balanced.java | 25 +-
.../apache/cloudstack/cluster/BalancedTest.java | 61 +-
plugins/drs/cluster/condensed/pom.xml | 2 +-
.../org/apache/cloudstack/cluster/Condensed.java | 26 +-
.../apache/cloudstack/cluster/CondensedTest.java | 61 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/event-bus/webhook/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 27 +-
.../kvm/resource/LibvirtComputingResource.java | 35 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 34 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-
.../LibvirtDeleteVMSnapshotCommandWrapper.java | 3 +-
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 14 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 2 +-
.../kvm/storage/KVMStoragePoolManager.java | 18 +-
.../kvm/storage/KVMStorageProcessor.java | 9 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 7 +-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 4 +-
.../kvm/resource/BridgeVifDriverTest.java | 58 +-
.../kvm/resource/LibvirtDomainXMLParserTest.java | 90 ++
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 7 +-
.../hypervisor/vmware/resource/VmwareResource.java | 17 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../kubernetes/cluster/KubernetesCluster.java | 4 +
.../cluster/KubernetesClusterManagerImpl.java | 78 +-
.../cluster/KubernetesClusterService.java | 2 +-
.../KubernetesClusterActionWorker.java | 4 +-
...ernetesClusterResourceModifierActionWorker.java | 2 +-
.../KubernetesClusterScaleWorker.java | 5 +-
.../cluster/KubernetesClusterManagerImplTest.java | 19 +
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 80 +-
.../response/VmMetricsStatsResponse.java | 2 +-
.../cloudstack/metrics/MetricsServiceImplTest.java | 163 ++-
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 4 +
.../internallbvmmgr/InternalLBVMServiceTest.java | 16 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../network/contrail/management/EventUtils.java | 11 +
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 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/shutdown/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
.../driver/CloudStackImageStoreDriverImpl.java | 11 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
.../driver/SwiftImageStoreDriverImpl.java | 15 +-
plugins/storage/object/ceph/pom.xml | 2 +-
plugins/storage/object/minio/pom.xml | 2 +-
plugins/storage/object/simulator/pom.xml | 2 +-
plugins/storage/sharedfs/storagevm/pom.xml | 2 +-
.../lifecycle/StorageVmSharedFSLifeCycle.java | 3 +-
.../lifecycle/StorageVmSharedFSLifeCycleTest.java | 3 +-
plugins/storage/volume/adaptive/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 4 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
plugins/storage/volume/linstor/CHANGELOG.md | 12 +
plugins/storage/volume/linstor/pom.xml | 2 +-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 22 +-
.../kvm/storage/LinstorStorageAdaptor.java | 38 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 30 +-
.../storage/datastore/util/LinstorUtil.java | 34 +
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/primera/pom.xml | 2 +-
.../datastore/adapter/primera/PrimeraAdapter.java | 38 +
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 6 +-
.../datastore/manager/ScaleIOSDCManagerImpl.java | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
plugins/storage/volume/storpool/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 8 +-
.../apache/cloudstack/ldap/LdapConfiguration.java | 5 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 4 +-
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 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../static-pin/pom.xml | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
.../auth/TotpUserTwoFactorAuthenticator.java | 4 +-
pom.xml | 4 +-
python/lib/cloudutils/configFileOps.py | 8 +-
python/lib/cloudutils/networkConfig.py | 13 +-
python/lib/cloudutils/utilities.py | 2 +-
quickcloud/pom.xml | 2 +-
scripts/util/keystore-cert-import | 2 +-
server/conf/cloudstack-sudoers.in | 2 +-
server/pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiServer.java | 28 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 6 +-
.../configuration/ConfigurationManagerImpl.java | 4 -
.../com/cloud/hypervisor/HypervisorGuruBase.java | 12 +-
.../java/com/cloud/network/NetworkModelImpl.java | 2 +-
.../network/security/SecurityGroupManagerImpl.java | 3 +
.../security/SecurityGroupManagerImpl2.java | 3 +
.../cloud/network/vpc/NetworkACLServiceImpl.java | 3 +
.../com/cloud/resource/ResourceManagerImpl.java | 12 +
.../resourcelimit/ResourceLimitManagerImpl.java | 6 +-
.../server/ManagementServerHostStatsEntry.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 154 ++-
.../main/java/com/cloud/server/StatsCollector.java | 21 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 18 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 518 ++++----
.../com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
.../cloud/storage/snapshot/SnapshotManager.java | 2 +-
.../storage/snapshot/SnapshotManagerImpl.java | 11 +-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 11 +
.../cloud/template/HypervisorTemplateAdapter.java | 11 +-
.../com/cloud/template/TemplateManagerImpl.java | 55 +-
.../java/com/cloud/user/AccountManagerImpl.java | 5 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 9 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 101 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 7 +
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 288 +++-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 42 +-
.../cloudstack/user/UserPasswordResetManager.java | 11 +
.../user/UserPasswordResetManagerImpl.java | 6 +
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 86 +-
.../vm/schedule/VMScheduleManagerImpl.java | 54 +-
.../com/cloud/server/ManagementServerImplTest.java | 1396 +++++++++++++++++++-
.../java/com/cloud/server/StatsCollectorTest.java | 112 ++
.../cluster/ClusterDrsServiceImplTest.java | 531 +++++++-
.../network/RoutedIpv4ManagerImplTest.java | 4 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 7 -
.../vm/schedule/VMSchedulerImplTest.java | 2 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 22 +-
.../resource/NfsSecondaryStorageResourceTest.java | 56 +-
systemvm/debian/opt/cloud/bin/checkrouter.sh | 22 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 2 +
systemvm/patch-sysvms.sh | 6 +-
systemvm/pom.xml | 2 +-
.../smoke/test_deploy_vm_root_resize.py | 9 +
test/integration/smoke/test_direct_download.py | 5 +-
.../smoke/test_import_unmanage_volumes.py | 22 +-
test/integration/smoke/test_over_provisioning.py | 8 +-
test/integration/smoke/test_restore_vm.py | 40 +-
test/integration/smoke/test_sharedfs_lifecycle.py | 20 +-
test/integration/smoke/test_snapshots.py | 52 +-
test/integration/smoke/test_usage.py | 27 +-
test/integration/smoke/test_vm_autoscaling.py | 36 +-
test/integration/smoke/test_vm_life_cycle.py | 4 +-
test/integration/smoke/test_vm_snapshot_kvm.py | 61 +-
test/integration/smoke/test_vm_snapshots.py | 24 +-
test/integration/smoke/test_volumes.py | 51 +-
test/integration/smoke/test_vpc_redundant.py | 7 +-
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
.../systemvmtemplate/scripts/configure_locale.sh | 4 +-
.../template-base_aarch64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_x86_64.json | 4 +-
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/marvin/marvin/lib/utils.py | 53 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/pom.xml | 2 +-
ui/public/config.json | 3 +-
ui/public/locales/en.json | 7 +-
ui/src/components/header/ProjectMenu.vue | 10 +-
ui/src/components/view/ListView.vue | 9 +-
ui/src/components/view/ResourceView.vue | 14 +-
ui/src/config/section/infra/managementServers.js | 4 +-
ui/src/config/section/offering.js | 27 +-
ui/src/config/section/storage.js | 2 +-
ui/src/store/modules/user.js | 16 +-
ui/src/views/AutogenView.vue | 17 +-
ui/src/views/compute/DeployVM.vue | 26 +-
ui/src/views/compute/EditVM.vue | 25 +-
ui/src/views/compute/ScaleVM.vue | 4 +-
.../views/compute/wizard/MultiNetworkSelection.vue | 16 +-
ui/src/views/image/RegisterOrUploadIso.vue | 45 +-
ui/src/views/infra/AddSecondaryStorage.vue | 6 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 59 -
ui/src/views/infra/network/TrafficTypesTab.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 16 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
ui/src/views/network/CreateVpc.vue | 16 +-
ui/src/views/network/NicsTab.vue | 65 +-
ui/src/views/network/VpnDetails.vue | 140 +-
ui/src/views/project/AccountsTab.vue | 12 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 12 +-
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 2 +-
.../main/java/com/cloud/utils/script/Script.java | 44 +-
.../utils/jsinterpreter/JsInterpreter.java | 169 ++-
.../utils/jsinterpreter/TagAsRuleHelper.java | 7 +-
.../cloudstack/utils/process/ProcessRunner.java | 11 +-
.../utils/jsinterpreter/JsInterpreterTest.java | 81 +-
.../utils/process/ProcessRunnerTest.java | 12 +
vmware-base/pom.xml | 2 +-
370 files changed, 5712 insertions(+), 1578 deletions(-)
