This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch netris-improvements
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 5d8727b7ca2 fix precommit ci issue
add cffa6e3603a backport: Incremental NAS backup support for KVM (#13074)
(#13877)
add a8c8c18e56a xenserver/xcpng: do not bypass secondary storage when copy
volumes between pools (#13750)
add 273b2ea32bf Fix importVM for use with dummy template (#14195)
add ac8d69c5c1d importVM improvements: RBD support, volume format, and
cluster selection (#14162)
add f23766d7c33 core: introduce a set of type adapters (#13624)
add 51c52490c95 Add schema upgrade path for 4.22.2 (#14179)
add 811c21b7f83 Merge branch '4.22' of github.com:apache/cloudstack into
netris-improvements
No new revisions were added by this update.
Summary of changes:
.../api/command/admin/vm/ImportVmCmd.java | 2 +-
.../api/command/admin/volume/ImportVolumeCmd.java | 2 +-
.../java/org/apache/cloudstack/backup/Backup.java | 6 +-
.../apache/cloudstack/backup/BackupProvider.java | 12 +
.../agent/transport/compat/AbstractTOAdaptor.java | 86 +++
.../agent/transport/compat/DiskTOAdaptor.java | 14 +-
.../transport/compat/MigrateCommandAdaptor.java | 14 +-
.../agent/transport/compat/NetworkTOAdaptor.java | 14 +-
.../transport/compat/VirtualMachineTOAdaptor.java | 13 +-
.../main/java/com/cloud/serializer/GsonHelper.java | 44 ++
.../org/apache/cloudstack/backup/BackupAnswer.java | 23 +
.../cloudstack/backup/TakeBackupCommand.java | 43 ++
.../com/cloud/agent/transport/RequestTest.java | 138 +++-
.../service/VolumeOrchestrationService.java | 6 +-
.../engine/orchestration/VolumeOrchestrator.java | 14 +-
.../orchestration/VolumeOrchestratorTest.java | 2 +-
...grade431to440.java => Upgrade42210to42220.java} | 12 +-
.../org/apache/cloudstack/backup/BackupVO.java | 8 +-
...cleanup.sql => schema-42210to42220-cleanup.sql} | 3 +-
...21to430-cleanup.sql => schema-42210to42220.sql} | 3 +-
.../storage/motion/AncientDataMotionStrategy.java | 8 +
.../motion/AncientDataMotionStrategyTest.java | 15 +
.../cloudstack/backup/NASBackupChainKeys.java | 62 ++
.../cloudstack/backup/NASBackupProvider.java | 658 +++++++++++++++++++-
.../cloudstack/backup/NASBackupProviderTest.java | 691 +++++++++++++++++++++
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 29 +-
.../LibvirtRestoreBackupCommandWrapper.java | 22 +
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 159 ++++-
.../LibvirtRestoreBackupCommandWrapperTest.java | 2 +
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 2 +-
scripts/vm/hypervisor/kvm/nasbackup.sh | 252 +++++++-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 11 +-
.../cloudstack/backup/BackupManagerImpl.java | 15 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 19 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 56 +-
.../VolumeImportUnmanageManagerImplTest.java | 11 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 63 +-
test/integration/smoke/test_backup_recovery_nas.py | 329 ++++++++++
ui/public/locales/en.json | 8 +-
ui/src/views/tools/ManageInstances.vue | 4 +-
41 files changed, 2747 insertions(+), 130 deletions(-)
create mode 100644
core/src/main/java/com/cloud/agent/transport/compat/AbstractTOAdaptor.java
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=> core/src/main/java/com/cloud/agent/transport/compat/DiskTOAdaptor.java (77%)
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=>
core/src/main/java/com/cloud/agent/transport/compat/MigrateCommandAdaptor.java
(71%)
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=> core/src/main/java/com/cloud/agent/transport/compat/NetworkTOAdaptor.java
(74%)
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=>
core/src/main/java/com/cloud/agent/transport/compat/VirtualMachineTOAdaptor.java
(74%)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade431to440.java
=> Upgrade42210to42220.java} (79%)
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql
=> schema-42210to42220-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql
=> schema-42210to42220.sql} (94%)
create mode 100644
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupChainKeys.java
