This is an automated email from the ASF dual-hosted git repository.

DaanHoogland pushed a change to branch ghi10752-config-vpn-vpc
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 2658380c3c3 use ConfigKeys for remote access VPN and VPC settings
    omit d58e94ba04d declare and register ConfigKeys for all remaining Config 
enum entries
     add 1abb5392428 fix: skip coverage grade comment on fork PRs (#14299)
     add 89a2b025f25 ui: improve related global config popup (#14149)
     add 1b4f19e5691 test: fix smoke test failures on xen/vmware (#13628)
     add 3df8b2a4159 Revert "security groups: conntrack only if needed 
(#10594)" (#14443)
     add bd809515e6c Add support for java 21 for debian packages (#14418)
     add a7697fe692a linstor: incremental snapshots on secondary storage 
(#13746)
     add 57e02515bab Add VM detail for KVM hint dedicated feature (#14254)
     add d92ebed547f Fix VR start on shared network with multiple guest IP 
ranges (#14282)
     add 345db511a26 Fix bucket usage retrieval workflow for Ceph RGW (#13776)
     add 90ef9b98cad kvm: restore backups into the volume they were taken from 
(#13922)
     add 15a9c76a0d2 Backup usage: bill each size for the time it applied, and 
publish the metric only on change (#14310)
     add def264402b4 StorPool support importing standalone disk volumes and 
importVm from SHARED (#14389)
     add de4ca48dfb3 Routed network ACL: match protocol-number rules with ip 
protocol, not ip nexthdr (#14352)
     add 8074c3e45e7 VPC egress ACL: end ACL_OUTBOUND with RETURN so its rules 
stay in order (#14355)
     add c4748669bfc UI: submit object storage creation using POST (#13768)
     add 0d380a015a5 Linstor add support for incremental nasbackup (#14194)
     add d31b5ff94e9 network: scope routed network/VPC subnets to a zone 
(#14421)
     add 2204e1b4a65 Reject AppCookie LB stickiness policy on Virtual Router 
networks (#13315)
     add e742aadfc97 Reject creating a snapshot with a duplicate name for the 
same volume (#14089)
     add 30ed411cffa Merge branch '4.20' into 4.22
     add 9872bfd61fc kvm: use the base CPU frequency as the host speed and 
expose the maximum frequency as a host detail (#14383)
     add fd6b755cc1b Merge remote-tracking branch 'apache/4.22'
     add b92ab08e690 Fix listPublicIpAddresses NPE on shared networks with a VR 
(#14249)
     add dccfe7d1f40 linstor: fix live migration with storage into Linstor when 
the target host has no replica (#14344)
     add c4c9731f0c8 Fix Cross zone templates registration for Edge Zones 
(#12874)
     add 5ffae3b047c Merge branch '4.22'
     add 82e5ede3f9a linstor unit test fix
     add e9af62c4ad5 flasharray/kvm/adaptive: NVMe-TCP transport for FlashArray 
primary storage (#13061)
     add c8abe2904b0 show a session expired warning when the session runs out 
(#14369)
     add b535ae8e6a9 Remove weekly status report and update model for daily 
issue triage (#14488)
     add 59dcb11f8d1 declare and register ConfigKeys for all remaining Config 
enum entries
     add c800b9071eb fix config descriptions and the 
NetworkLBHaproxyStatsVisibility name
     add 58b34377f6b use ConfigKeys for account, domain, project and SSO 
settings
     add 17b846bac80 use ConfigKeys for remote access VPN and VPC settings

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   (2658380c3c3)
            \
             N -- N -- N   refs/heads/ghi10752-config-vpn-vpc (17b846bac80)

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/daily-issue-triage.lock.yml      |   34 +-
 .github/workflows/daily-issue-triage.md            |    5 +-
 .github/workflows/sonar-check.yml                  |    3 +-
 .github/workflows/weekly-repo-status.lock.yml      | 1471 --------------------
 .github/workflows/weekly-repo-status.md            |  141 --
 PendingReleaseNotes                                |   10 +
 api/src/main/java/com/cloud/host/Host.java         |    1 +
 api/src/main/java/com/cloud/storage/Storage.java   |    3 +-
 .../java/com/cloud/storage/VolumeApiService.java   |    4 +-
 .../main/java/com/cloud/vm/VmDetailConstants.java  |    3 +
 .../admin/storage/AddObjectStoragePoolCmd.java     |    2 +-
 .../network/Ipv4GuestSubnetNetworkMap.java         |    2 +
 .../volume/VolumeImportUnmanageService.java        |   11 +-
 .../admin/storage/AddObjectStoragePoolCmdTest.java |   37 +
 client/bindir/cloud-update-xenserver-licenses.in   |    7 +-
 .../cloudstack/backup/TakeBackupCommand.java       |    9 +
 debian/control                                     |   10 +-
 .../service/NetworkOrchestrationService.java       |    2 +-
 .../api/storage/PrimaryDataStoreDriver.java        |   21 +
 .../subsystem/api/storage/TemplateService.java     |    2 +-
 .../java/com/cloud/template/TemplateManager.java   |    2 +-
 .../com/cloud/vm/snapshot/VMSnapshotManager.java   |    2 +-
 .../engine/orchestration/NetworkOrchestrator.java  |    2 +-
 .../java/com/cloud/storage/dao/SnapshotDao.java    |    2 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |   16 +
 .../java/com/cloud/storage/dao/VMTemplateDao.java  |    2 +
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |    8 +
 .../java/com/cloud/usage/dao/UsageBackupDao.java   |    3 +-
 .../com/cloud/usage/dao/UsageBackupDaoImpl.java    |   52 +-
 .../cloudstack/backup/BackupUsageMetricVO.java}    |   80 +-
 .../backup/dao/BackupUsageMetricDao.java}          |   13 +-
 .../backup/dao/BackupUsageMetricDaoImpl.java       |   54 +
 .../network/Ipv4GuestSubnetNetworkMapVO.java       |   15 +-
 .../network/dao/Ipv4GuestSubnetNetworkMapDao.java  |    4 +-
 .../dao/Ipv4GuestSubnetNetworkMapDaoImpl.java      |    8 +-
 .../storage/datastore/db/SnapshotDataStoreDao.java |    7 +
 .../datastore/db/SnapshotDataStoreDaoImpl.java     |   46 +-
 .../spring-engine-schema-core-daos-context.xml     |    1 +
 .../META-INF/db/schema-42210to42300-cleanup.sql    |   54 +
 .../com/cloud/storage/dao/SnapshotDaoImplTest.java |   80 ++
 .../cloud/usage/dao/UsageBackupDaoImplTest.java    |  175 +++
 .../datastore/db/SnapshotDataStoreDaoImplTest.java |   61 +
 .../motion/StorageSystemDataMotionStrategy.java    |   17 +-
 .../storage/image/TemplateServiceImpl.java         |   16 +-
 .../storage/snapshot/SnapshotObject.java           |   11 +-
 .../storage/snapshot/SnapshotObjectTest.java       |  101 ++
 .../datastore/ObjectInDataStoreManagerImpl.java    |    5 +-
 .../cloudstack/backup/NASBackupChainKeys.java      |   18 +
 .../cloudstack/backup/NASBackupProvider.java       |  195 ++-
 .../cloudstack/backup/NASBackupProviderTest.java   |  295 ++++
 .../kvm/resource/LibvirtComputingResource.java     |    7 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |    9 +
 .../wrapper/LibvirtResizeVolumeCommandWrapper.java |   10 +
 .../LibvirtRestoreBackupCommandWrapper.java        |   17 +-
 .../wrapper/LibvirtTakeBackupCommandWrapper.java   |  213 ++-
 .../hypervisor/kvm/storage/KVMStoragePool.java     |   33 +
 .../kvm/storage/KVMStorageProcessor.java           |    9 +-
 .../kvm/storage/MultipathNVMeOFAdapterBase.java    |  722 ++++++++++
 .../kvm/storage/MultipathNVMeOFPool.java           |  165 +++
 .../hypervisor/kvm/storage/NVMeTCPAdapter.java     |   47 +-
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |   41 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |    4 +-
 .../LibvirtRestoreBackupCommandWrapperTest.java    |  126 ++
 .../LibvirtTakeBackupCommandWrapperTest.java       |  280 ++++
 .../cloudstack/utils/linux/KVMHostInfoTest.java    |   46 +
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |   19 +
 .../com/cloud/resource/SimulatorDiscoverer.java    |   27 +-
 .../driver/CephObjectStoreDriverImpl.java          |   17 +-
 .../storage/datastore/adapter/ProviderVolume.java  |    3 +-
 .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java  |   24 +-
 .../adapter/flasharray/FlashArrayAdapter.java      |  160 ++-
 .../adapter/flasharray/FlashArrayConnection.java   |    9 +
 .../adapter/flasharray/FlashArrayVolume.java       |   26 +
 plugins/storage/volume/linstor/CHANGELOG.md        |   17 +
 .../api/storage/LinstorBackupSnapshotCommand.java  |    7 +
 .../LinstorBackupSnapshotCommandWrapper.java       |   61 +-
 .../kvm/storage/LinstorStorageAdaptor.java         |  225 ++-
 .../hypervisor/kvm/storage/LinstorStoragePool.java |   22 +
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |  111 +-
 .../storage/datastore/util/LinstorUtil.java        |   75 +-
 .../storage/motion/LinstorDataMotionStrategy.java  |  120 +-
 .../kvm/storage/LinstorStorageAdaptorTest.java     |  344 +++++
 .../LinstorPrimaryDataStoreDriverImplTest.java     |   92 ++
 .../storage/datastore/util/LinstorUtilTest.java    |   61 +
 .../motion/LinstorDataMotionStrategyTest.java      |  357 +++++
 .../kvm/storage/StorPoolStorageAdaptor.java        |    3 +-
 .../driver/StorPoolPrimaryDataStoreDriver.java     |  130 +-
 .../storage/datastore/util/StorPoolUtil.java       |   10 +-
 .../driver/StorPoolPrimaryDataStoreDriverTest.java |  365 +++++
 python/lib/cloudutils/db.py                        |   13 +-
 scripts/util/migrate-dynamicroles.py               |   15 +-
 scripts/vm/hypervisor/kvm/nasbackup.sh             |  282 +++-
 scripts/vm/network/security_group.py               |  232 ++-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |    7 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   20 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |   68 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |    1 +
 .../configuration/ConfigurationManagerImpl.java    |    9 +
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |   13 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |    3 +-
 .../cloud/network/router/NetworkHelperImpl.java    |   22 +-
 .../com/cloud/projects/ProjectManagerImpl.java     |   12 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   91 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   11 +-
 .../java/com/cloud/server/ManagementServer.java    |    2 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |   15 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |    3 +-
 .../cloud/storage/download/DownloadListener.java   |    2 +-
 .../cloud/storage/snapshot/SnapshotManager.java    |    2 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   25 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |    2 +-
 .../cloudstack/backup/BackupManagerImpl.java       |   82 +-
 .../cloudstack/network/RoutedIpv4ManagerImpl.java  |   30 +-
 .../volume/VolumeImportUnmanageManagerImpl.java    |   42 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |   84 +-
 .../java/com/cloud/api/ApiResponseHelperTest.java  |   52 +-
 .../test/java/com/cloud/api/ApiServletTest.java    |  416 +++++-
 .../configuration/ConfigurationManagerTest.java    |    3 +
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |   57 +-
 .../network/router/NetworkHelperImplTest.java      |   45 +-
 .../storage/snapshot/SnapshotManagerImplTest.java  |  155 ++-
 .../cloudstack/backup/BackupManagerTest.java       |  167 ++-
 .../network/RoutedIpv4ManagerImplTest.java         |   74 +-
 .../schedule/vm/VMScheduleWorkerTest.java          |    7 +-
 .../VolumeImportUnmanageManagerImplTest.java       |   36 +-
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |    8 +
 .../resource/SecondaryStorageDiscoverer.java       |   28 +-
 systemvm/debian/opt/cloud/bin/configure.py         |    2 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |   10 +
 systemvm/test/TestCsAclRouting.py                  |   67 +
 systemvm/test/TestCsAddress.py                     |   77 +-
 test/integration/plugins/linstor/README.md         |   30 +
 .../plugins/linstor/linstor_test_utils.py          |   83 ++
 .../linstor/test_linstor_encrypted_snapshots.py    |   32 +-
 .../linstor/test_linstor_incremental_snapshots.py  |  639 +++++++++
 .../plugins/linstor/test_linstor_volumes.py        |   46 +-
 .../plugins/storpool/TestStorPoolImportVolume.py   |  610 ++++++++
 test/integration/smoke/test_cluster_drs.py         |   15 +-
 .../smoke/test_deploy_vms_in_parallel.py           |   36 +
 test/integration/smoke/test_events_resource.py     |    1 +
 test/integration/smoke/test_host_maintenance.py    |   69 +-
 test/integration/smoke/test_kms_lifecycle.py       |    5 +
 .../smoke/test_network_extension_namespace.py      |    4 +-
 .../smoke/test_nonstrict_affinity_group.py         |    7 +-
 test/integration/smoke/test_usage.py               |   11 +-
 test/integration/smoke/test_vm_life_cycle.py       |    1 +
 test/integration/smoke/test_vm_strict_host_tags.py |    4 +
 tools/marvin/marvin/lib/base.py                    |    8 +-
 ui/public/locales/en.json                          |    4 +
 ui/src/components/view/InfoCard.vue                |    7 +-
 ui/src/utils/plugins.js                            |    1 -
 ui/src/utils/request.js                            |    8 +-
 ui/src/views/dashboard/SetupTwoFaAtLogin.vue       |   11 +-
 ui/src/views/dashboard/VerifyTwoFa.vue             |   11 +-
 ui/src/views/infra/AddObjectStorage.vue            |    6 +-
 ui/src/views/infra/AddPrimaryStorage.vue           |   17 +-
 ui/src/views/setting/ConfigurationValue.vue        |   42 +-
 ui/tests/unit/utils/request.spec.js                |   84 ++
 ui/tests/unit/views/dashboard/TwoFaFailure.spec.js |   72 +
 ui/tests/unit/views/infra/AddObjectStorage.spec.js |   99 ++
 .../java/com/cloud/usage/UsageManagerImpl.java     |   10 +-
 .../java/com/cloud/usage/UsageManagerImplTest.java |   47 +
 .../src/main/java/com/cloud/utils/StringUtils.java |    2 +-
 .../test/java/com/cloud/utils/StringUtilsTest.java |   29 +
 .../cloud/hypervisor/vmware/util/VmwareClient.java |    2 +-
 165 files changed, 9012 insertions(+), 2470 deletions(-)
 delete mode 100644 .github/workflows/weekly-repo-status.lock.yml
 delete mode 100644 .github/workflows/weekly-repo-status.md
 copy engine/schema/src/main/java/{com/cloud/upgrade/dao/VersionVO.java => 
org/apache/cloudstack/backup/BackupUsageMetricVO.java} (54%)
 copy 
engine/{orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java
 => 
schema/src/main/java/org/apache/cloudstack/backup/dao/BackupUsageMetricDao.java}
 (72%)
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupUsageMetricDaoImpl.java
 create mode 100644 
engine/schema/src/test/java/com/cloud/storage/dao/SnapshotDaoImplTest.java
 create mode 100644 
engine/schema/src/test/java/com/cloud/usage/dao/UsageBackupDaoImplTest.java
 create mode 100644 
engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/SnapshotObjectTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathNVMeOFAdapterBase.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathNVMeOFPool.java
 copy 
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/packet/server/AbstractRect.java
 => 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/NVMeTCPAdapter.java
 (51%)
 create mode 100644 
plugins/storage/volume/linstor/src/test/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptorTest.java
 create mode 100644 
plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/motion/LinstorDataMotionStrategyTest.java
 create mode 100644 systemvm/test/TestCsAclRouting.py
 create mode 100644 test/integration/plugins/linstor/linstor_test_utils.py
 create mode 100644 
test/integration/plugins/linstor/test_linstor_incremental_snapshots.py
 create mode 100644 
test/integration/plugins/storpool/TestStorPoolImportVolume.py
 create mode 100644 ui/tests/unit/utils/request.spec.js
 create mode 100644 ui/tests/unit/views/dashboard/TwoFaFailure.spec.js
 create mode 100644 ui/tests/unit/views/infra/AddObjectStorage.spec.js

Reply via email to