This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 4d370a3772d Merge remote-tracking branch 'origin/4.19'
add 33bb92acce2 Veeam: Support Veeam 11 and 12 (#8241)
add b34f0931373 veeam: fix some issues with restoring volume from backup
and attaching it to VM (#8570)
add 1c98b5a4e56 Change Cryptsetup validation (#8482)
add 3f33592b676 systemvm: vncport evaluation (#8369)
add 1d5230b5168 server: use ed25519 instead of rsa when generate
public/private keys (#8549)
add ca55fc08e9f Added missing metrics English locale strings (#8560)
add b2e29931e89 UI: fix icmp code/type of ACL rule are not display if the
value is 0 (#8589)
add b8904f75ddf Merge remote-tracking branch 'apache/4.18' into 4.19
add 54225ecd150 Veeam: fix incompatible types: String cannot be converted
to Date
add c7955471528 server: fix build error with
BackupManagerTest.tryRestoreVMTestRestoreSucceeded
add 37bb24f29e0 Merge branch '4.19'
No new revisions were added by this update.
Summary of changes:
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 4 +-
.../PrepareForBackupRestorationCommand.java} | 15 +-
.../org/apache/cloudstack/backup/BackupVO.java | 13 +
plugins/backup/veeam/pom.xml | 15 +
.../cloudstack/backup/VeeamBackupProvider.java | 70 ++++-
.../cloudstack/backup/veeam/VeeamClient.java | 302 ++++++++++++++++---
.../backup/veeam/api/{Job.java => BackupFile.java} | 123 ++++----
.../api/{ObjectsInJob.java => BackupFiles.java} | 18 +-
.../api/{ObjectInJob.java => VmRestorePoint.java} | 109 +++++--
.../{ObjectsInJob.java => VmRestorePoints.java} | 18 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 331 ++++++++++++++++++++-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 23 +-
.../hypervisor/vmware/resource/VmwareResource.java | 32 ++
.../resource/VmwareStorageLayoutHelper.java | 21 +-
.../storage/resource/VmwareStorageProcessor.java | 23 +-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
.../cloudstack/backup/BackupManagerImpl.java | 29 +-
.../cloudstack/backup/BackupManagerTest.java | 73 +++--
systemvm/agent/scripts/consoleproxy.sh | 33 --
systemvm/agent/scripts/secstorage.sh | 33 --
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 2 +-
.../smoke/test_backup_recovery_veeam.py | 308 +++++++++++++++++++
tools/marvin/marvin/lib/base.py | 66 +++-
ui/public/locales/en.json | 2 +
ui/src/components/view/ListView.vue | 2 +-
ui/src/config/section/compute.js | 4 +-
ui/src/config/section/storage.js | 6 +-
ui/src/views/compute/backup/BackupSchedule.vue | 8 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 25 ++
.../hypervisor/vmware/mo/VmdkFileDescriptor.java | 59 ++++
30 files changed, 1460 insertions(+), 309 deletions(-)
copy core/src/main/java/{com/cloud/agent/api/CheckVirtualMachineCommand.java
=> org/apache/cloudstack/backup/PrepareForBackupRestorationCommand.java} (78%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{Job.java
=> BackupFile.java} (55%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{ObjectsInJob.java
=> BackupFiles.java} (72%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{ObjectInJob.java
=> VmRestorePoint.java} (58%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{ObjectsInJob.java
=> VmRestorePoints.java} (70%)
delete mode 100755 systemvm/agent/scripts/consoleproxy.sh
delete mode 100755 systemvm/agent/scripts/secstorage.sh
create mode 100644 test/integration/smoke/test_backup_recovery_veeam.py
