This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from be2b8edd207 NSX: Refactor Network & VPC offering (#8110)
add e333f2705aa user-shared networks: fix few issues (#6887)
add c0128e2f9a4 Improve template download error message (#8029)
add c3aeba1f4a4 Merge remote-tracking branch 'origin/4.18'
add b58ffec4cd2 [cleanup] Deleted file FakeDhcpSnooper.java and
DhcpSnooper.java (#7672)
add 66e5d41a15f ui: Fix sorter across different components (#8046)
add e0ab2a4bd4a Enable four more `flake8` rules (#7811)
add 7e998f92283 pre-commit: add hook `check-merge-conflict` (#7883)
add 43aed457060 Format quota email currency values (#7605)
add e290ac54514 systemvm: remove config in /etc/pam.d/systemd-user to fix
[email protected] (#8048)
add a9f3af85cb1 Default value of force should be false for template delete
operation (#7731)
add 864a1958680 .github: run Sonar Check only on PRs from
apache/cloudstack branches (#8058)
add b4c7705d4bc Merge remote-tracking branch 'apache/4.18' into main
add d2ad9363a26 ui: update dashboard screenshot for README (#8069)
add 8b281284a26 ui: Fix non admin logouts (#8065)
add 7b4cf1b1c68 ui: update vm deploy form iso label (#8075)
add 8350ce5aa40 storage: allow VM snapshots without memory for KVM when
global setting allows (#8062)
add 8a34afa8ab8 Merge remote-tracking branch 'origin/4.18'
add dccd37af505 Run ResourceCountCheckTask only in the longest running
management server (#7977)
add fb3a2ecb57e Fix NPE if global setting implicit.host.tags is set to
null (#8066)
add 3e7f21a1909 vm-import: fix stopped managed vms listing in unmanaged
instances (#7606)
add 9df580cef45 Merge remote-tracking branch 'apache/4.18' into main
add 0c14e4603d8 Allow password definition during VM deploy (#6947)
add 3486a3c310c Add domainpath to listnetwork and UI network tab (#7386)
add 55bef2b069c Add option to define password during password reset (#6863)
add 0b3438bfbed Update pom.xml reflections version (#8019)
add 314537a8df3 Merge release branch 4.18 to main
add e437d1016f6 Snapshot removal and storage cleanup logs (#8031)
add ba24a18f27d kvm: fix direct download template size (#8093)
add 065abe2a3b6 test,refactor: fix test_project_resources cleanup (#8097)
add c9d230369a7 Merge release branch 4.18 to main
add 4a86a0d2339 linstor: Fix template volume missing on copy node (#8082)
add be039a1e46e Merge remote-tracking branch 'apache/4.18' into main
add 91a570e4619 Refactoring swift util test (#8099)
add e35fdff7678 ui: add action to delete traffic type (#8076)
add 76ab621a5a3 Fix UUID for child datastores in all cases (#8057)
add 8eaf2648b64 Merge release branch 4.18 to main
add 9834d5168fd pre-commit: standardize more line endings to `lf` (#7804)
add 0183e252794 Fix VM snapshot size during storage capacity check (#8101)
add 540c7b802f4 test: add test for standalone snapshot (#8104)
add 20046ffe61d Merge remote-tracking branch 'apache/4.18' into main
add 67cb9b9e40b linstor: fix template copy on non hyperconverged setups
(#8114)
add fcbf540369d Merge remote-tracking branch 'apache/4.18' into main
add f62b6340334 ui: correctly show volume physical size (#8119)
add a2ec1f37778 marvin,test: fix directdownload template checksum test
(#8096)
add e199678101e ui: fix bulk delete template from zones (#8118)
add 1bb6130795c Merge remote-tracking branch 'apache/4.18' into main
add d3d3027ba63 Fix ISOs and templates listing pagination (#7974)
add a8700bff7f7 server: set Default NIC when VM has no default NIC (#7859)
add 99ded8169be Merge remote-tracking branch 'apache/4.18' into main
add 543c54c7189 api,server,ui: snapshot copy, multi-zone replica (#7873)
add dc25278f282 Merge branch 'main' of
https://github.com/apache/cloudstack into nsx-integration
add 2fe8e9cd96b Merge branch 'nsx-integration' of
https://github.com/apache/cloudstack into nsx-integration
No new revisions were added by this update.
Summary of changes:
.github/linters/.flake8 | 9 +-
.github/workflows/sonar-check.yml | 2 +-
.pre-commit-config.yaml | 4 +-
.../java/com/cloud/agent/dhcp/FakeDhcpSnooper.java | 161 ---
api/src/main/java/com/cloud/event/EventTypes.java | 3 +-
.../java/com/cloud/storage/VolumeApiService.java | 7 +-
.../cloud/storage/snapshot/SnapshotApiService.java | 10 +-
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../apache/cloudstack/api/ResponseGenerator.java | 2 +-
.../vpc/ListPrivateGatewaysCmdByAdminCmd.java | 35 +
.../api/command/user/snapshot/CopySnapshotCmd.java | 181 +++
.../command/user/snapshot/CreateSnapshotCmd.java | 19 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 2 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 14 +
.../command/user/snapshot/DeleteSnapshotCmd.java | 11 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 36 +-
.../command/user/template/CreateTemplateCmd.java | 8 +
.../command/user/template/DeleteTemplateCmd.java | 4 +-
.../api/command/user/vm/DeployVMCmd.java | 8 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 13 +-
.../command/user/vpc/CreatePrivateGatewayCmd.java | 2 +-
.../command/user/vpc/ListPrivateGatewaysCmd.java | 7 +-
.../api/command/user/zone/ListZonesCmd.java | 11 +-
.../cloudstack/api/response/NetworkResponse.java | 8 +
.../api/response/SnapshotPolicyResponse.java | 9 +
.../cloudstack/api/response/SnapshotResponse.java | 61 +-
.../cloudstack/api/response/ZoneResponse.java | 16 +-
.../org/apache/cloudstack/query/QueryService.java | 7 +
.../api/command/test/CreateSnapshotCmdTest.java | 15 +-
.../command/user/snapshot/CopySnapshotCmdTest.java | 133 +++
.../user/snapshot/CreateSnapshotPolicyCmdTest.java | 11 +
.../user/snapshot/DeleteSnapshotCmdTest.java | 28 +-
.../user/snapshot/ListSnapshotsCmdTest.java | 60 +
.../user/template/CreateTemplateCmdTest.java | 28 +-
.../java/com/cloud/agent/transport/Request.java | 23 +-
.../StorageSubsystemCommandHandlerBase.java | 17 +-
.../storage/template/HttpTemplateDownloader.java | 15 +-
...der.java => SimpleHttpMultiFileDownloader.java} | 351 +++---
.../cloud/storage/template/TemplateLocation.java | 14 +-
.../download/HttpsDirectTemplateDownloader.java | 52 +-
.../storage/command/DownloadCommand.java | 15 +-
.../command/QuerySnapshotZoneCopyAnswer.java | 32 +-
.../command/QuerySnapshotZoneCopyCommand.java | 37 +-
.../cloudstack/storage/to/SnapshotObjectTO.java | 10 +
.../StorageSubsystemCommandHandlerBaseTest.java | 43 +
.../storage/command/DownloadCommandTest.java | 38 +-
.../command/QuerySnapshotZoneCopyAnswerTest.java | 46 +
.../storage/to/SnapshotObjectTOTest.java | 43 +
.../subsystem/api/storage/DataStoreManager.java | 2 +
.../subsystem/api/storage/SnapshotDataFactory.java | 12 +-
.../engine/subsystem/api/storage/SnapshotInfo.java | 2 +
.../subsystem/api/storage/SnapshotService.java | 7 +
.../subsystem/api/storage/SnapshotStrategy.java | 4 +-
.../api/storage/StorageStrategyFactory.java | 2 +
.../com/cloud/vm/VmWorkTakeVolumeSnapshot.java | 12 +-
.../com/cloud/vm/VmWorkTakeVolumeSnapshotTest.java | 37 +-
.../engine/orchestration/DataMigrationUtility.java | 4 +-
.../engine/orchestration/NetworkOrchestrator.java | 14 +-
.../engine/orchestration/StorageOrchestrator.java | 4 +-
.../engine/orchestration/VolumeOrchestrator.java | 2 +-
.../main/java/com/cloud/dc/dao/DataCenterDao.java | 2 +
.../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 10 +
.../main/java/com/cloud/storage/SnapshotVO.java | 10 +-
.../java/com/cloud/storage/SnapshotZoneVO.java | 118 ++
.../com/cloud/storage/dao/SnapshotZoneDao.java | 30 +-
.../com/cloud/storage/dao/SnapshotZoneDaoImpl.java | 84 ++
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 2 -
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 12 +-
.../storage/datastore/db/SnapshotDataStoreDao.java | 21 +-
.../datastore/db/SnapshotDataStoreDaoImpl.java | 87 +-
.../storage/datastore/db/SnapshotDataStoreVO.java | 57 +
...n-daos-between-management-and-usage-context.xml | 1 +
.../spring-engine-schema-core-daos-context.xml | 1 +
.../main/resources/META-INF/db/schema-302to303.sql | 392 +++----
.../main/resources/META-INF/db/schema-304to305.sql | 778 ++++++-------
.../resources/META-INF/db/schema-41810to41900.sql | 113 ++
engine/service/src/main/webapp/index.jsp | 46 +-
.../storage/image/SecondaryStorageServiceImpl.java | 2 +-
.../manager/ImageStoreProviderManagerImpl.java | 6 +
.../manager/ImageStoreProviderManagerImplTest.java | 47 +
.../storage/snapshot/CephSnapshotStrategy.java | 17 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 179 +--
.../storage/snapshot/ScaleIOSnapshotStrategy.java | 16 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 81 +-
.../storage/snapshot/SnapshotObject.java | 22 +-
.../storage/snapshot/SnapshotServiceImpl.java | 175 ++-
.../snapshot/StorageSystemSnapshotStrategy.java | 23 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 23 +-
.../storage/snapshot/CephSnapshotStrategyTest.java | 4 +-
.../snapshot/DefaultSnapshotStrategyTest.java | 177 ++-
.../snapshot/SnapshotDataFactoryImplTest.java | 4 +-
.../storage/snapshot/SnapshotServiceImplTest.java | 6 +-
.../storage/datastore/DataStoreManagerImpl.java | 12 +
.../datastore/ObjectInDataStoreManager.java | 2 -
.../datastore/ObjectInDataStoreManagerImpl.java | 23 -
.../datastore/PrimaryDataStoreProviderManager.java | 2 +
.../storage/helper/StorageStrategyFactoryImpl.java | 7 +-
.../storage/image/BaseImageStoreDriverImpl.java | 84 +-
.../image/datastore/ImageStoreProviderManager.java | 1 +
.../api/storage/StrategyPriorityTest.java | 27 +-
.../datastore/db/SnapshotDataStoreDaoImplTest.java | 38 +-
.../image/db/TemplateDataStoreDaoImplTest.java | 7 +-
.../PrimaryDataStoreProviderManagerImpl.java | 9 +
.../PrimaryDataStoreProviderManagerImplTest.java | 48 +
.../cloud/cluster/dao/ManagementServerHostDao.java | 2 +
.../cluster/dao/ManagementServerHostDaoImpl.java | 12 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 20 +-
.../cloudstack/quota/QuotaAlertManagerImpl.java | 30 +-
.../presetvariables/PresetVariableHelper.java | 19 +-
.../cloudstack/quota/constant/QuotaConfig.java | 3 +
.../presetvariables/PresetVariableHelperTest.java | 43 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 2 +-
.../DotNet/ServerResource/.nuget/NuGet.Config | 10 +-
.../DotNet/ServerResource/.nuget/NuGet.targets | 226 ++--
.../HypervResource/HypervResource.csproj | 206 ++--
.../ServerResource.Tests.csproj | 256 ++---
.../ServerResource/WmiWrappers/WmiWrappers.csproj | 372 +++---
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
.../VmwareStorageSubsystemCommandHandler.java | 44 +-
.../kvm/storage/LinstorStorageAdaptor.java | 19 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 18 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 104 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 155 ++-
pom.xml | 2 +-
scripts/storage/secondary/createvolume.sh | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 170 +--
.../main/java/com/cloud/api/ApiResponseHelper.java | 48 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 282 ++++-
.../com/cloud/api/query/ViewResponseHelper.java | 19 +
.../com/cloud/api/query/dao/SnapshotJoinDao.java | 41 +
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 248 ++++
.../com/cloud/api/query/dao/TemplateJoinDao.java | 2 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 13 +
.../com/cloud/api/query/vo/SnapshotJoinVO.java | 352 ++++++
.../java/com/cloud/deploy/FirstFitPlanner.java | 12 +-
.../java/com/cloud/event/ActionEventUtils.java | 1 -
.../java/com/cloud/network/NetworkServiceImpl.java | 61 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 37 +-
.../com/cloud/server/ManagementServerImpl.java | 4 +
.../com/cloud/storage/CreateSnapshotPayload.java | 11 +
.../java/com/cloud/storage/StorageManagerImpl.java | 81 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 104 +-
.../cloud/storage/download/DownloadListener.java | 2 +
.../cloud/storage/download/DownloadMonitor.java | 2 +
.../storage/download/DownloadMonitorImpl.java | 104 +-
.../cloud/storage/snapshot/SnapshotManager.java | 2 -
.../storage/snapshot/SnapshotManagerImpl.java | 485 +++++++-
.../com/cloud/template/TemplateManagerImpl.java | 29 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 76 +-
.../direct/download/DirectDownloadManagerImpl.java | 12 +-
.../apache/cloudstack/snapshot/SnapshotHelper.java | 46 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 122 +-
.../com/cloud/api/query/QueryManagerImplTest.java | 83 ++
.../java/com/cloud/event/ActionEventUtilsTest.java | 60 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 3 -
.../cloud/storage/VolumeApiServiceImplTest.java | 137 +--
.../storage/snapshot/SnapshotManagerImplTest.java | 408 +++++++
.../storage/snapshot/SnapshotManagerTest.java | 224 ++--
.../cloud/template/TemplateManagerImplTest.java | 137 +--
.../java/com/cloud/vm/UserVmManagerImplTest.java | 61 +
.../cloudstack/snapshot/SnapshotHelperTest.java | 60 +-
server/src/test/resources/db.properties | 144 +--
.../resource/NfsSecondaryStorageResource.java | 34 +
.../storage/template/DownloadManagerImpl.java | 323 ++++--
.../resource/NfsSecondaryStorageResourceTest.java | 37 +
.../storage/template/DownloadManagerImplTest.java | 47 +
systemvm/debian/opt/cloud/bin/setup/init.sh | 3 +-
test/integration/component/test_ip_reservation.py | 6 +-
.../component/test_project_resources.py | 80 +-
test/integration/component/test_snapshot_copy.py | 351 ++++++
test/integration/smoke/test_snapshots.py | 156 +++
test/integration/smoke/test_templates.py | 33 +-
test/metadata/func/commands | 382 +++----
test/metadata/func/error_events.properties | 64 +-
test/metadata/func/regression_events.properties | 86 +-
tools/eclipse/eclipse.epf | 1184 ++++++++++----------
tools/marvin/marvin/lib/base.py | 2 +
ui/docs/screenshot-dashboard.png | Bin 2285907 -> 377788
bytes
ui/public/locales/en.json | 14 +
ui/public/locales/pt_BR.json | 1 +
ui/src/components/view/EventsTab.vue | 2 +-
ui/src/components/view/ListView.vue | 2 +-
ui/src/config/section/compute.js | 1 +
ui/src/config/section/network.js | 6 +-
ui/src/config/section/storage.js | 24 +-
ui/src/views/AutogenView.vue | 2 +-
ui/src/views/compute/ChangeAffinity.vue | 6 +-
ui/src/views/compute/ResetSshKeyPair.vue | 2 +-
ui/src/views/compute/ResetUserData.vue | 2 +-
.../views/compute/wizard/TemplateIsoSelection.vue | 6 +-
ui/src/views/dashboard/UsageDashboard.vue | 2 +-
ui/src/views/image/TemplateZones.vue | 2 +-
ui/src/views/infra/CpuSockets.vue | 6 +-
ui/src/views/infra/Metrics.vue | 4 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 63 +-
ui/src/views/storage/CreateTemplate.vue | 294 +++++
ui/src/views/storage/CreateVolume.vue | 40 +-
ui/src/views/storage/FormSchedule.vue | 67 +-
ui/src/views/storage/RecurringSnapshotVolume.vue | 1 +
ui/src/views/storage/ScheduledSnapshots.vue | 13 +
.../SnapshotZones.vue} | 167 +--
ui/src/views/storage/TakeSnapshot.vue | 92 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 7 +
.../src/main/java/com/cloud/utils/NumbersUtil.java | 22 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 8 +-
.../java/com/cloud/utils/storage/QCOW2Utils.java | 3 +-
.../utils/imagestore/ImageStoreUtil.java | 2 +-
.../test/java/com/cloud/utils/SwiftUtilTest.java | 72 +-
.../test/java/com/cloud/utils/UriUtilsTest.java | 14 +-
211 files changed, 9381 insertions(+), 4162 deletions(-)
delete mode 100644
agent/src/main/java/com/cloud/agent/dhcp/FakeDhcpSnooper.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListPrivateGatewaysCmdByAdminCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CopySnapshotCmd.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/snapshot/CopySnapshotCmdTest.java
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
api/src/test/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmdTest.java
(60%)
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmdTest.java
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
api/src/test/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmdTest.java
(60%)
copy
core/src/main/java/com/cloud/storage/template/{HttpTemplateDownloader.java =>
SimpleHttpMultiFileDownloader.java} (57%)
mode change 100755 => 100644
copy agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java =>
core/src/main/java/org/apache/cloudstack/storage/command/QuerySnapshotZoneCopyAnswer.java
(60%)
copy agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java =>
core/src/main/java/org/apache/cloudstack/storage/command/QuerySnapshotZoneCopyCommand.java
(52%)
create mode 100644
core/src/test/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBaseTest.java
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
core/src/test/java/org/apache/cloudstack/storage/command/DownloadCommandTest.java
(51%)
create mode 100644
core/src/test/java/org/apache/cloudstack/storage/command/QuerySnapshotZoneCopyAnswerTest.java
create mode 100644
core/src/test/java/org/apache/cloudstack/storage/to/SnapshotObjectTOTest.java
copy agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java =>
engine/components-api/src/test/java/com/cloud/vm/VmWorkTakeVolumeSnapshotTest.java
(56%)
create mode 100644
engine/schema/src/main/java/com/cloud/storage/SnapshotZoneVO.java
rename agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java =>
engine/schema/src/main/java/com/cloud/storage/dao/SnapshotZoneDao.java (60%)
create mode 100644
engine/schema/src/main/java/com/cloud/storage/dao/SnapshotZoneDaoImpl.java
create mode 100644
engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImplTest.java
create mode 100644
engine/storage/volume/src/test/java/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImplTest.java
create mode 100644
server/src/main/java/com/cloud/api/query/dao/SnapshotJoinDao.java
create mode 100644
server/src/main/java/com/cloud/api/query/dao/SnapshotJoinDaoImpl.java
create mode 100644
server/src/main/java/com/cloud/api/query/vo/SnapshotJoinVO.java
create mode 100644
server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java
create mode 100644
services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/template/DownloadManagerImplTest.java
create mode 100644 test/integration/component/test_snapshot_copy.py
create mode 100644 ui/src/views/storage/CreateTemplate.vue
copy ui/src/views/{image/TemplateZones.vue => storage/SnapshotZones.vue} (74%)
