This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 9d1ac575830 4.22 Health Check, please don't merge this!
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 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 8babe514c4f Merge branch '4.22' into healthcheck-4.22
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/host/Host.java | 1 +
.../admin/storage/AddObjectStoragePoolCmd.java | 2 +-
.../network/Ipv4GuestSubnetNetworkMap.java | 2 +
.../volume/VolumeImportUnmanageService.java | 11 +-
.../admin/storage/AddObjectStoragePoolCmdTest.java | 37 ++
.../cloudstack/backup/TakeBackupCommand.java | 9 +
.../api/storage/PrimaryDataStoreDriver.java | 21 +
.../subsystem/api/storage/TemplateService.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 +--
...upDetailsDao.java => BackupUsageMetricDao.java} | 7 +-
.../backup/dao/BackupUsageMetricDaoImpl.java | 54 ++
.../network/Ipv4GuestSubnetNetworkMapVO.java | 15 +-
.../network/dao/Ipv4GuestSubnetNetworkMapDao.java | 4 +-
.../dao/Ipv4GuestSubnetNetworkMapDaoImpl.java | 8 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-42210to42220.sql | 41 ++
.../com/cloud/storage/dao/SnapshotDaoImplTest.java | 80 +++
.../cloud/usage/dao/UsageBackupDaoImplTest.java | 175 ++++++
.../storage/image/TemplateServiceImpl.java | 16 +-
.../cloudstack/backup/NASBackupChainKeys.java | 18 +
.../cloudstack/backup/NASBackupProvider.java | 195 ++++++-
.../cloudstack/backup/NASBackupProviderTest.java | 292 ++++++++++
.../kvm/resource/LibvirtComputingResource.java | 4 +
.../LibvirtRestoreBackupCommandWrapper.java | 17 +-
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 213 ++++++-
.../hypervisor/kvm/storage/KVMStoragePool.java | 33 ++
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 42 +-
.../LibvirtRestoreBackupCommandWrapperTest.java | 126 +++++
.../LibvirtTakeBackupCommandWrapperTest.java | 280 ++++++++++
.../cloudstack/utils/linux/KVMHostInfoTest.java | 46 ++
.../com/cloud/resource/SimulatorDiscoverer.java | 27 +-
plugins/storage/volume/linstor/CHANGELOG.md | 11 +
.../kvm/storage/LinstorStorageAdaptor.java | 225 +++++++-
.../hypervisor/kvm/storage/LinstorStoragePool.java | 21 +
.../storage/motion/LinstorDataMotionStrategy.java | 120 +++-
.../kvm/storage/LinstorStorageAdaptorTest.java | 344 ++++++++++++
.../motion/LinstorDataMotionStrategyTest.java | 356 ++++++++++++
.../kvm/storage/StorPoolStorageAdaptor.java | 3 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 130 ++++-
.../storage/datastore/util/StorPoolUtil.java | 10 +-
.../driver/StorPoolPrimaryDataStoreDriverTest.java | 366 +++++++++++++
scripts/vm/hypervisor/kvm/nasbackup.sh | 285 +++++++++-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 4 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 20 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 66 ++-
.../configuration/ConfigurationManagerImpl.java | 9 +
.../main/java/com/cloud/hypervisor/KVMGuru.java | 13 +-
.../cloud/network/router/NetworkHelperImpl.java | 22 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 15 +-
.../cloud/storage/download/DownloadListener.java | 2 +-
.../storage/snapshot/SnapshotManagerImpl.java | 5 +
.../cloudstack/backup/BackupManagerImpl.java | 82 ++-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 30 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 46 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 93 +++-
.../java/com/cloud/api/ApiResponseHelperTest.java | 51 ++
.../test/java/com/cloud/api/ApiServletTest.java | 362 ++++++++++++
.../configuration/ConfigurationManagerTest.java | 3 +
.../java/com/cloud/hypervisor/KVMGuruTest.java | 48 ++
.../network/router/NetworkHelperImplTest.java | 46 ++
.../storage/snapshot/SnapshotManagerImplTest.java | 79 ++-
.../cloudstack/backup/BackupManagerTest.java | 135 +++++
.../network/RoutedIpv4ManagerImplTest.java | 74 ++-
.../VolumeImportUnmanageManagerImplTest.java | 90 ++-
.../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 ++-
.../plugins/storpool/TestStorPoolImportVolume.py | 610 +++++++++++++++++++++
tools/marvin/marvin/lib/base.py | 8 +-
ui/public/locales/en.json | 1 +
ui/src/components/view/InfoCard.vue | 7 +-
ui/src/utils/plugins.js | 1 -
ui/src/utils/request.js | 1 -
ui/src/views/infra/AddObjectStorage.vue | 6 +-
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 +
88 files changed, 5824 insertions(+), 297 deletions(-)
copy engine/schema/src/main/java/{com/cloud/upgrade/dao/VersionVO.java =>
org/apache/cloudstack/backup/BackupUsageMetricVO.java} (54%)
copy
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/{BackupDetailsDao.java
=> BackupUsageMetricDao.java} (75%)
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
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/storpool/TestStorPoolImportVolume.py
create mode 100644 ui/tests/unit/views/infra/AddObjectStorage.spec.js
