This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit f99eebfa3c4 do not merge
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 b09acb8fd05 UI: Fix deploy VM wizard vApp properties (#8072)
add ae724b9d4c2 Fix EULA section while parsing OVF file (#8081)
add 39d6c20fb39 Merge remote-tracking branch 'apache/4.18' into main
add 7d81659671a do not merge
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 (f99eebfa3c4)
\
N -- N -- N refs/heads/dummy (7d81659671a)
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:
.../com/cloud/agent/api/storage/OVFHelper.java | 6 +-
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 +
.../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 +
.../api/command/user/zone/ListZonesCmd.java | 11 +-
.../api/response/SnapshotPolicyResponse.java | 9 +
.../cloudstack/api/response/SnapshotResponse.java | 61 ++-
.../cloudstack/api/response/ZoneResponse.java | 16 +-
.../org/apache/cloudstack/query/QueryService.java | 7 +
.../com/cloud/agent/api/storage/OVFHelperTest.java | 131 +++++
.../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 +-
.../storage/command/DownloadCommand.java | 15 +-
.../command/QuerySnapshotZoneCopyAnswer.java | 29 +-
.../command/QuerySnapshotZoneCopyCommand.java | 36 +-
.../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 +-
.../cloud/vm/VmWorkTakeVolumeSnapshotTest.java} | 32 +-
.../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} | 27 +-
.../com/cloud/storage/dao/SnapshotZoneDaoImpl.java | 84 ++++
.../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 +
.../resources/META-INF/db/schema-41810to41900.sql | 113 +++++
.../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 | 161 +++++-
.../snapshot/StorageSystemSnapshotStrategy.java | 23 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 5 +-
.../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 ++
.../framework/jobs/impl/AsyncJobManagerImpl.java | 20 +-
.../presetvariables/PresetVariableHelper.java | 19 +-
.../presetvariables/PresetVariableHelperTest.java | 43 +-
.../VmwareStorageSubsystemCommandHandler.java | 44 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 18 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 104 ++--
.../storage/snapshot/StorPoolSnapshotStrategy.java | 155 ++++--
scripts/storage/secondary/createvolume.sh | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 170 ++++---
.../main/java/com/cloud/api/ApiResponseHelper.java | 38 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 200 ++++++++
.../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/vo/SnapshotJoinVO.java | 352 +++++++++++++
.../java/com/cloud/event/ActionEventUtils.java | 1 -
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../com/cloud/storage/CreateSnapshotPayload.java | 11 +
.../java/com/cloud/storage/StorageManagerImpl.java | 26 +-
.../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 | 14 +
.../apache/cloudstack/snapshot/SnapshotHelper.java | 46 +-
.../java/com/cloud/event/ActionEventUtilsTest.java | 60 +--
.../cloud/storage/VolumeApiServiceImplTest.java | 137 ++---
.../storage/snapshot/SnapshotManagerImplTest.java | 408 +++++++++++++++
.../storage/snapshot/SnapshotManagerTest.java | 224 ++++-----
.../cloud/template/TemplateManagerImplTest.java | 137 ++---
.../cloudstack/snapshot/SnapshotHelperTest.java | 60 ++-
.../resource/NfsSecondaryStorageResource.java | 34 ++
.../storage/template/DownloadManagerImpl.java | 323 ++++++++----
.../resource/NfsSecondaryStorageResourceTest.java | 37 ++
.../storage/template/DownloadManagerImplTest.java | 47 ++
test/integration/component/test_snapshot_copy.py | 351 +++++++++++++
ui/public/locales/en.json | 9 +
ui/public/locales/pt_BR.json | 1 +
ui/src/config/section/storage.js | 18 +-
ui/src/views/compute/DeployVM.vue | 129 ++---
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 +
ui/src/views/storage/SnapshotZones.vue | 551 +++++++++++++++++++++
ui/src/views/storage/TakeSnapshot.vue | 92 +++-
ui/src/views/tools/ImportUnmanagedInstance.vue | 7 +
139 files changed, 6982 insertions(+), 1489 deletions(-)
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
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
core/src/main/java/org/apache/cloudstack/storage/command/QuerySnapshotZoneCopyAnswer.java
(60%)
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
core/src/main/java/org/apache/cloudstack/storage/command/QuerySnapshotZoneCopyCommand.java
(51%)
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
engine/{api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
components-api/src/test/java/com/cloud/vm/VmWorkTakeVolumeSnapshotTest.java}
(55%)
create mode 100644
engine/schema/src/main/java/com/cloud/storage/SnapshotZoneVO.java
copy
engine/{api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=> schema/src/main/java/com/cloud/storage/dao/SnapshotZoneDao.java} (59%)
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
create mode 100644 ui/src/views/storage/SnapshotZones.vue
