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/12/04 17:19:00 UTC
(cloudstack) 02/02: Merge branch 'main' of https://github.com/apache/cloudstack into dedicate-backup-offering-to-domain
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch dedicate-backup-offering-to-domain
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 6df64407090d5ff5260b82dfba14337bce2eee11
Merge: 21bc89e0727 26009659f9b
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Thu Dec 4 11:34:12 2025 -0500
Merge branch 'main' of https://github.com/apache/cloudstack into dedicate-backup-offering-to-domain
PRE-COMMIT.md => PRE_COMMIT.md | 2 +-
.../conf/uefi.properties.in | 19 +--
api/src/main/java/com/cloud/network/Networks.java | 12 +-
.../user/address/ListPublicIpAddressesCmd.java | 2 +-
.../test/java/com/cloud/network/NetworksTest.java | 18 +++
debian/cloudstack-agent.install | 1 +
debian/cloudstack-agent.postinst | 2 +-
debian/control | 2 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 12 ++
.../engine/orchestration/VolumeOrchestrator.java | 4 +-
.../main/java/com/cloud/event/UsageEventVO.java | 22 +++
.../com/cloud/event/dao/UsageEventDaoImpl.java | 8 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 50 +++---
...e42200to42300.java => Upgrade42200to42210.java} | 6 +-
...e42200to42300.java => Upgrade42210to42300.java} | 4 +-
.../main/java/com/cloud/usage/UsageVolumeVO.java | 14 +-
.../com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 +
.../java/com/cloud/usage/dao/UsageVolumeDao.java | 6 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 86 ++++-------
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +-
...cleanup.sql => schema-42200to42210-cleanup.sql} | 2 +-
...to42300-cleanup.sql => schema-42200to42210.sql} | 9 +-
...cleanup.sql => schema-42210to42300-cleanup.sql} | 2 +-
...ma-42200to42300.sql => schema-42210to42300.sql} | 2 +-
.../java/com/cloud/utils/db/TransactionLegacy.java | 142 +++++++++---------
packaging/debian/replace.properties | 5 +
packaging/el8/cloud.spec | 13 +-
packaging/el8/replace.properties | 5 +
.../cloudstack/backup/veeam/VeeamClient.java | 45 +++---
.../cloudstack/backup/veeam/VeeamClientTest.java | 4 +-
.../kvm/resource/LibvirtComputingResource.java | 16 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 6 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 7 +-
.../cluster/KubernetesClusterService.java | 2 +-
.../storage/datastore/api/VTreeMigrationInfo.java | 2 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 18 ++-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 139 ++++++++---------
.../cloudstack/ldap/ADLdapUserManagerImplTest.java | 5 +-
pom.xml | 4 +
server/src/main/java/com/cloud/api/ApiDBUtils.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 3 +
server/src/main/java/com/cloud/api/ApiServer.java | 28 +++-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 6 +
.../com/cloud/server/ManagementServerImpl.java | 55 ++++---
.../com/cloud/storage/VolumeApiServiceImpl.java | 17 ++-
.../storage/listener/VolumeStateListener.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +-
.../com/cloud/server/ManagementServerImplTest.java | 66 ++++++--
.../cloud/storage/VolumeApiServiceImplTest.java | 8 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 8 +-
.../cloudstack/backup/BackupManagerTest.java | 2 +-
setup/bindir/cloud-setup-databases.in | 12 +-
systemvm/systemvm-agent-descriptor.xml | 1 +
ui/public/locales/en.json | 2 +-
.../components/view/ImageDeployInstanceButton.vue | 35 +++--
ui/src/components/view/SettingsTab.vue | 3 +-
ui/src/components/widgets/InfiniteScrollSelect.vue | 24 ++-
ui/src/views/AutogenView.vue | 9 +-
.../compute/wizard/ZoneBlockRadioGroupSelect.vue | 2 +-
ui/src/views/network/IpAddressesTab.vue | 84 +++++------
ui/src/views/setting/ConfigurationTable.vue | 6 +-
ui/src/views/setting/ConfigurationValue.vue | 16 ++
.../java/com/cloud/usage/UsageManagerImpl.java | 167 ++++++++++++---------
.../com/cloud/usage/parser/VolumeUsageParser.java | 23 ++-
utils/src/main/java/com/cloud/utils/EnumUtils.java | 28 +---
.../cloudstack/utils/process/ProcessRunner.java | 11 +-
.../utils/process/ProcessRunnerTest.java | 12 ++
67 files changed, 779 insertions(+), 561 deletions(-)
diff --cc engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
index b6299bc3799,7024368a1d5..60268e08312
--- a/engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
@@@ -16,15 -16,5 +16,15 @@@
-- under the License.
--;
- -- Schema upgrade from 4.22.0.0 to 4.23.0.0
+ -- Schema upgrade from 4.22.1.0 to 4.23.0.0
--;
+
+CREATE TABLE `cloud`.`backup_offering_details` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `backup_offering_id` bigint unsigned NOT NULL COMMENT 'Backup offering id',
+ `name` varchar(255) NOT NULL,
+ `value` varchar(1024) NOT NULL,
+ `display` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Should detail be displayed to the end user',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_offering_details__backup_offering_id` FOREIGN KEY `fk_offering_details__backup_offering_id`(`backup_offering_id`) REFERENCES `backup_offering`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --cc server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
index 47c3c0d5d4c,8b13fd47494..2c9c8465c5c
--- a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
+++ b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
@@@ -1086,7 -1081,7 +1086,7 @@@ public class BackupManagerTest
assertEquals("root-disk-offering-uuid", VmDiskInfo.getDiskOffering().getUuid());
assertEquals(Long.valueOf(5), VmDiskInfo.getSize());
- assertNull(com.cloud.vm.VmDiskInfo.getDeviceId());
- assertEquals(null, VmDiskInfo.getDeviceId());
++ assertNull(VmDiskInfo.getDeviceId());
}
@Test