This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch
6778-if-kafka-is-turned-on-internal-subs-dont-work
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 40d7da6707d Merge release branch 4.18 to main
add 2f701e1f893 New configs for quota email's headers and footers (#7852)
add 819dd7b75c1 server: remove supportedOwner from Resource.ResourceType
(#7416)
add 78411fd405c test: fix test_vm_autoscaling.py which does not work due
to userdata improvement (#7921)
add 5917fed773c refactor getUploadParamsForIso (#7813)
add 2e6100d85bb utils: build both SHADED and original jars (#7912)
add 54a7a5d7e1d utils: rename cloud-utils-*-SHADED.jar to
cloud-utils-*-bundled.jar to fix the build error on MacOS (#7944)
add 2cccd8f754a db: Add index on cluster_details.name for FirstFitPlanner
speedup (#7922)
add 89e0a4ca25c PowerFlex: Handle missing volumes gracefully during delete
volume (#7924)
add 57c61fb33cf Fix direct download https compressed qcow2 template
checker (#7932)
add 0bb05f7871a ui: don't skip if dataview has multiple items in response
(#7947)
add 126dd5fa4cf kvm: fix live vm migration between local storage pools
(#7945)
add f049f5409e0 server: fix dualstack ipv6 networks for vxlan (#7933)
add f6b2a587272 Merge branch '4.18'
add 710f34ee90c api: Fix listLoadBalancerRuleInstances api call (#7892)
add 940733cedfb UI: Fix user role login due to missing API access on
custom hypervisor name (#7939)
add c4e53c0095b Allow editing of host and storage tags of system offerings
in the UI (#7941)
add 3ec30076356 Generate coverage for Simulator based integration tests &
ui tests in github actions (#7784)
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 0bfef5d9da4 Merge commit 'b8c8e17318cc28e57d1b38f2aa2f0b456c9bac52'
add edcd0da62ed UI: update versions to 4.19.0
add f049d4d189f Increase reserve on ScaleIO disk formatting for
fragmentation (#7955)
add 45616aaf614 Merge remote-tracking branch 'origin/4.18'
add 4eb110af736 Remove unneeded duplicate words (#7850)
add d25521e96fa Fix issues in VM Scheduler (#7782)
add c428d3bb341 Add and improve logs in snapshot scheduling (#6925)
add 9c9b17885ff upgrade: fix upgrade from 4.18.1.0 to 4.18.2.0-SNAPSHOT
(#7959)
add 09ae0499b21 ldap trust map cleanup on domain delete (#7915)
add 0375714ded5 Merge release branch 4.18 to main
add 481d2bd9c3f Remove powermock from core (#7978)
add 84277e783b5 remove powermock from engine (#7975)
No new revisions were added by this update.
Summary of changes:
.github/workflows/ci.yml | 26 ++-
.github/workflows/codecov.yml | 1 +
.github/workflows/ui.yml | 9 +
.../java/com/cloud/configuration/Resource.java | 47 ++---
.../java/com/cloud/server/ManagementService.java | 2 +-
.../cloudstack/api/AbstractGetUploadParamsCmd.java | 10 +-
.../command/user/config/ListCapabilitiesCmd.java | 1 +
.../command/user/iso/GetUploadParamsForIsoCmd.java | 21 +-
.../api/command/user/vm/ListNicsCmd.java | 2 +-
.../api/response/CapabilitiesResponse.java | 8 +
.../com/cloud/agent/api/storage/OVFHelperTest.java | 2 +-
.../download/HttpsDirectTemplateDownloader.java | 3 +-
.../com/cloud/resource/ServerResourceBaseTest.java | 162 ++++++++-------
.../cloud/storage/template/OVAProcessorTest.java | 51 +++--
.../cloud/storage/template/QCOW2ProcessorTest.java | 8 +-
.../cloud/storage/template/VhdProcessorTest.java | 8 +-
.../org.mockito.plugins.MockMaker | 0
debian/rules | 2 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 2 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../com/cloud/network/NetworkStateListener.java | 2 +-
.../main/java/com/cloud/storage/StorageUtil.java | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../configuration/dao/ResourceCountDaoImpl.java | 15 --
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 4 +
.../cloud/upgrade/DatabaseVersionHierarchy.java | 9 +
.../cloud/upgrade/dao/DatabaseAccessObject.java | 29 ++-
.../java/com/cloud/upgrade/dao/DbUpgradeUtils.java | 8 +
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 5 +
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 4 +
.../main/resources/META-INF/db/schema-21to22.sql | 2 +-
.../main/resources/META-INF/db/schema-2214to30.sql | 2 +-
.../main/resources/META-INF/db/schema-410to420.sql | 2 +-
.../as/dao/AutoScaleVmGroupDaoImplTest.java | 19 +-
.../dao/AutoScaleVmGroupStatisticsDaoImplTest.java | 31 +--
.../as/dao/AutoScaleVmGroupVmMapDaoImplTest.java | 27 ++-
.../com/cloud/network/dao/NetworkDaoImplTest.java | 35 ++--
.../storage/dao/StoragePoolTagsDaoImplTest.java | 4 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 23 ++-
.../java/com/cloud/upgrade/GuestOsMapperTest.java | 16 +-
.../upgrade/dao/DatabaseAccessObjectTest.java | 77 +++++++-
.../com/cloud/upgrade/dao/DbUpgradeUtilsTest.java | 14 +-
.../cloud/usage/dao/UsageStorageDaoImplTest.java | 46 ++---
.../datastore/db/PrimaryDataStoreDaoImplTest.java | 15 +-
.../org.mockito.plugins.MockMaker | 0
.../motion/AncientDataMotionStrategyTest.java | 12 +-
.../snapshot/SnapshotDataFactoryImplTest.java | 57 +++---
.../storage/snapshot/SnapshotServiceImplTest.java | 30 +--
.../vmsnapshot/VMSnapshotStrategyKVMTest.java | 3 -
.../org.mockito.plugins.MockMaker | 0
.../java/com/cloud/utils/db/GenericDaoBase.java | 2 +-
.../cloudstack/quota/QuotaAlertManagerImpl.java | 22 ++-
.../cloudstack/quota/constant/QuotaConfig.java | 6 +
.../quota/QuotaAlertManagerImplTest.java | 29 ++-
packaging/centos7/cloud.spec | 2 +-
packaging/centos8/cloud.spec | 2 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 3 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 2 +-
.../hypervisor/kvm/resource/LibvirtConnection.java | 2 -
.../resource/wrapper/LibvirtCheckUrlCommand.java | 5 +
.../kvm/storage/ScaleIOStorageAdaptor.java | 4 +-
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 6 +-
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../KubernetesClusterActionWorker.java | 4 +-
.../cloud/network/resource/NetscalerResource.java | 4 +-
...vpConfigureSharedNetworkUuidCommandWrapper.java | 4 +-
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 5 +-
.../datastore/client/ScaleIOGatewayClientImpl.java | 19 +-
.../cloudstack/api/command/LdapListUsersCmd.java | 2 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 37 +++-
.../xenserver/copy_vhd_from_secondarystorage.sh | 2 +-
server/src/main/java/com/cloud/api/ApiServer.java | 2 +-
.../java/com/cloud/event/ActionEventUtils.java | 2 +-
.../main/java/com/cloud/event/AlertGenerator.java | 2 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 4 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 18 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 18 ++
.../com/cloud/network/rules/RulesManagerImpl.java | 4 +-
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 59 +++---
.../com/cloud/server/ConfigurationServerImpl.java | 27 +--
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../com/cloud/storage/ImageStoreDetailsUtil.java | 4 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 4 +-
.../storage/listener/SnapshotStateListener.java | 2 +-
.../storage/listener/VolumeStateListener.java | 2 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 91 ++++++---
.../java/com/cloud/user/AccountManagerImpl.java | 42 ++--
.../java/com/cloud/user/DomainManagerImpl.java | 86 ++++----
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
.../java/com/cloud/vm/UserVmStateListener.java | 2 +-
.../vm/schedule/VMScheduleManagerImpl.java | 2 +-
.../apache/cloudstack/vm/schedule/VMScheduler.java | 2 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 31 ++-
.../snapshot/SnapshotSchedulerImplTest.java | 217 +++++++++++++++++++++
.../java/com/cloud/user/DomainManagerImplTest.java | 2 +-
.../vm/schedule/VMSchedulerImplTest.java | 73 +++----
.../src/main/java/rdpclient/RdpClient.java | 2 +-
.../storage/template/DownloadManagerImpl.java | 2 +-
setup/bindir/cloud-setup-databases.in | 2 +-
setup/db/create-schema.sql | 4 +-
systemvm/agent/noVNC/app/ui.js | 2 +-
systemvm/agent/noVNC/core/display.js | 2 +-
systemvm/agent/noVNC/core/rfb.js | 2 +-
.../component/maint/test_host_high_availability.py | 2 +-
.../component/test_acl_isolatednetwork.py | 6 +-
...est_acl_sharednetwork_deployVM-impersonation.py | 2 +-
.../component/test_base_image_updation.py | 8 +-
test/integration/component/test_configdrive.py | 12 +-
test/integration/component/test_ldap.py | 2 +-
.../integration/component/test_ldap_auto_import.py | 2 +-
.../component/test_multiple_ips_per_nic.py | 2 +-
test/integration/smoke/test_privategw_acl.py | 2 +-
test/integration/smoke/test_vm_autoscaling.py | 10 +-
test/integration/smoke/test_vm_schedule.py | 2 +-
.../testpaths/testpath_multiple_snapshot.py | 2 +-
test/integration/testpaths/testpath_restore_vm.py | 2 +-
test/integration/testpaths/testpath_usage.py | 2 +-
.../testpaths/testpath_volumelifecycle.py | 2 +-
test/scripts/deploycluster.sh | 2 +-
test/systemvm/test_update_config.py | 2 +-
tools/marvin/marvin/misc/build/CI.md | 2 +-
ui/jest.config.js | 2 +-
ui/package-lock.json | 2 +-
ui/package.json | 2 +-
ui/src/config/section/offering.js | 4 +-
ui/src/store/modules/user.js | 12 +-
ui/src/views/AutogenView.vue | 4 -
utils/pom.xml | 1 +
.../java/com/cloud/utils/storage/QCOW2Utils.java | 42 ++--
.../com/cloud/utils/storage/QCOW2UtilsTest.java | 6 +-
134 files changed, 1153 insertions(+), 736 deletions(-)
copy {agent =>
core}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%)
copy {agent =>
engine/schema}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
engine/storage/snapshot}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
create mode 100644
server/src/test/java/com/cloud/storage/snapshot/SnapshotSchedulerImplTest.java
