You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2025/04/09 17:36:41 UTC
(cloudstack) 02/02: Merge branch '4.20' of https://github.com/apache/cloudstack into support-xen84-py3
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch support-xen84-py3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 5e2afc38afc5c88c7229d9d04850660c0c8385ac
Merge: 9a99c4396d6 6850147c9e8
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Wed Apr 9 13:36:20 2025 -0400
Merge branch '4.20' of https://github.com/apache/cloudstack into support-xen84-py3
agent/bindir/cloud-setup-agent.in | 13 +
agent/bindir/libvirtqemuhook.in | 13 +
.../user/backup/DeleteBackupScheduleCmd.java | 14 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 8 +
.../api/response/BackupRepositoryResponse.java | 12 -
.../cloudstack/api/response/NetworkResponse.java | 3 +-
.../apache/cloudstack/backup/BackupManager.java | 5 +-
client/bindir/cloud-setup-management.in | 14 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 3 +
.../BasePrimaryDataStoreLifeCycleImpl.java | 54 +-
.../framework/config/impl/ConfigDepotImpl.java | 19 +-
.../framework/config/impl/ConfigDepotImplTest.java | 6 +
.../presetvariables/GenericPresetVariable.java | 6 +-
.../activationrule/presetvariables/Resource.java | 6 +-
packaging/el8/cloud.spec | 1 +
.../cloudstack/backup/NASBackupProvider.java | 10 +-
.../cloudstack/backup/VeeamBackupProvider.java | 3 +
.../main/java/com/cloud/ha/KVMInvestigator.java | 5 +-
.../LibvirtGetVmIpAddressCommandWrapper.java | 167 ++++--
.../LibvirtRestoreBackupCommandWrapper.java | 22 +-
.../LibvirtGetVmIpAddressCommandWrapperTest.java | 320 ++++++++++
.../xenserver/resource/CitrixResourceBase.java | 646 ++++++++++-----------
.../xen56/XenServer56FenceCommandWrapper.java | 2 +-
.../xen56p1/XenServer56FP1FenceCommandWrapper.java | 2 +-
.../CitrixCreateVMSnapshotCommandWrapper.java | 23 +-
.../CitrixDeleteVMSnapshotCommandWrapper.java | 2 +-
.../CitrixRevertToVMSnapshotCommandWrapper.java | 13 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixStopCommandWrapper.java | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 14 +
.../KubernetesClusterDestroyWorker.java | 4 +
.../cloudstack/metrics/PrometheusExporterImpl.java | 3 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 26 +-
plugins/storage/volume/linstor/CHANGELOG.md | 12 +
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 29 +-
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 5 +-
.../ScaleIOPrimaryDataStoreLifeCycle.java | 55 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 119 ++--
.../storage/datastore/util/StorPoolUtil.java | 6 +
.../storage/motion/StorPoolDataMotionStrategy.java | 15 +-
pom.xml | 2 +-
python/lib/cloudutils/syscfg.py | 7 +-
python/lib/cloudutils/utilities.py | 4 +
scripts/storage/secondary/setup-sysvm-tmplt | 10 +-
scripts/vm/hypervisor/kvm/nasbackup.sh | 68 ++-
server/conf/cloudstack-sudoers.in | 2 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 160 +++--
server/src/main/java/com/cloud/api/ApiDBUtils.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 1 -
.../java/com/cloud/api/query/QueryManagerImpl.java | 9 +
.../java/com/cloud/network/NetworkServiceImpl.java | 6 +-
.../cloud/network/router/NetworkHelperImpl.java | 4 +-
.../com/cloud/resource/ResourceManagerImpl.java | 194 +++----
.../main/java/com/cloud/server/StatsCollector.java | 4 +-
.../agent/lb/IndirectAgentLBServiceImpl.java | 38 +-
.../cloudstack/backup/BackupManagerImpl.java | 48 +-
.../storage/heuristics/presetvariables/Domain.java | 2 +-
.../GenericHeuristicPresetVariable.java | 10 +-
.../com/cloud/network/NetworkServiceImplTest.java | 2 +-
.../heuristics/presetvariables/AccountTest.java} | 37 +-
.../heuristics/presetvariables/DomainTest.java} | 34 +-
.../GenericHeuristicPresetVariableTest.java} | 33 +-
.../presetvariables/SecondaryStorageTest.java} | 46 +-
.../heuristics/presetvariables/SnapshotTest.java} | 45 +-
.../heuristics/presetvariables/TemplateTest.java} | 47 +-
.../heuristics/presetvariables/VolumeTest.java} | 45 +-
setup/bindir/cloud-setup-databases.in | 2 +
.../plugins/linstor/test_linstor_volumes.py | 252 ++++++--
test/integration/smoke/test_purge_expunged_vms.py | 4 +-
.../template-base_aarch64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_x86_64.json | 4 +-
tools/marvin/marvin/config/test_data.py | 2 +-
ui/public/config.json | 1 +
ui/public/index.html | 2 +-
ui/public/locales/en.json | 11 +-
ui/public/locales/pt_BR.json | 1 +
ui/src/components/view/ResourceLimitTab.vue | 2 +-
ui/src/config/section/compute.js | 4 +-
ui/src/config/section/config.js | 2 +-
ui/src/config/section/infra/hosts.js | 38 +-
ui/src/config/section/storage.js | 21 +-
ui/src/layouts/UserLayout.vue | 5 +-
ui/src/locales/index.js | 2 +-
ui/src/main.js | 2 +-
ui/src/utils/network.js | 51 ++
ui/src/views/compute/StartVirtualMachine.vue | 2 +-
ui/src/views/dashboard/UsageDashboard.vue | 8 +-
ui/src/views/infra/ChangeHostPassword.vue | 150 +++++
ui/src/views/infra/ConfigureHostOOBM.vue | 172 ++++++
ui/src/views/infra/HostEnableDisable.vue | 42 +-
ui/src/views/infra/HostInfo.vue | 46 +-
ui/src/views/network/VpcTiersTab.vue | 22 +-
ui/src/views/offering/AddDiskOffering.vue | 1 -
ui/src/views/storage/CreateTemplate.vue | 113 ++--
96 files changed, 2317 insertions(+), 1199 deletions(-)