This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a55f85af50ad9d40ba5752265e4f32f55e5f326d Merge: c681d0d0a2f d700e2db643 Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Thu Jan 29 15:55:03 2026 +0530 Merge branch '4.22' api/src/main/java/com/cloud/event/EventTypes.java | 1 + .../com/cloud/network/vpc/NetworkACLService.java | 3 + .../org/apache/cloudstack/alert/AlertService.java | 4 +- .../command/admin/host/AddSecondaryStorageCmd.java | 24 +- .../command/user/config/ListCapabilitiesCmd.java | 1 + .../command/user/network/CreateNetworkACLCmd.java | 30 +- .../command/user/network/ImportNetworkACLCmd.java | 132 +++++++ .../command/user/snapshot/CreateSnapshotCmd.java | 3 +- .../api/response/CapabilitiesResponse.java | 8 + .../cloudstack/api/response/SnapshotResponse.java | 16 + .../java/org/apache/cloudstack/ServerDaemon.java | 15 +- .../service/StorageOrchestrationService.java | 3 +- .../subsystem/api/storage/TemplateService.java | 4 +- .../main/java/com/cloud/alert/AlertManager.java | 1 - .../java/com/cloud/resource/ResourceManager.java | 4 +- .../java/com/cloud/storage/StorageManager.java | 5 +- .../engine/orchestration/StorageOrchestrator.java | 45 ++- .../main/java/com/cloud/usage/dao/UsageDao.java | 2 +- .../java/com/cloud/usage/dao/UsageDaoImpl.java | 37 +- .../main/java/com/cloud/usage/dao/UsageJobDao.java | 2 + .../java/com/cloud/usage/dao/UsageJobDaoImpl.java | 3 +- .../storage/datastore/db/SnapshotDataStoreDao.java | 14 + .../datastore/db/SnapshotDataStoreDaoImpl.java | 42 ++- .../cloud.insert_category_if_not_exists.sql} | 15 +- ...tension_custom_action_details_if_not_exists.sql | 46 +++ ...nsert_extension_custom_action_if_not_exists.sql | 46 +++ ...loud.insert_extension_detail_if_not_exists.sql} | 34 +- .../cloud.insert_extension_if_not_exists.sql} | 26 +- .../cloud.update_category_for_guest_oses.sql} | 21 +- ...te_new_and_delete_old_category_for_guest_os.sql | 35 ++ .../resources/META-INF/db/schema-42020to42030.sql | 6 + .../resources/META-INF/db/schema-42200to42210.sql | 6 + .../storage/image/TemplateServiceImpl.java | 157 +++++++-- .../storage/image/TemplateServiceImplTest.java | 171 ++++++++- .../storage/volume/VolumeServiceImpl.java | 4 +- .../src/main/java/com/cloud/utils/db/Filter.java | 3 +- .../java/com/cloud/utils/db/GenericDaoBase.java | 4 +- .../cloudstack/backup/veeam/VeeamClient.java | 7 +- .../cloudstack/backup/veeam/VeeamClientTest.java | 5 +- .../LibvirtUpdateHostPasswordCommandWrapper.java | 3 +- .../CitrixUpdateHostPasswordCommandWrapper.java | 2 +- .../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 2 + .../configuration/ConfigurationManagerImpl.java | 2 +- .../deploy/DeploymentPlanningManagerImpl.java | 82 +++-- .../main/java/com/cloud/event/AlertGenerator.java | 5 +- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 4 +- .../cloud/network/vpc/NetworkACLServiceImpl.java | 120 ++++++- .../com/cloud/resource/ResourceManagerImpl.java | 5 +- .../resourcelimit/ResourceLimitManagerImpl.java | 10 +- .../com/cloud/server/ManagementServerImpl.java | 4 + .../com/cloud/storage/ImageStoreDetailsUtil.java | 11 + .../java/com/cloud/storage/StorageManagerImpl.java | 2 +- .../storage/snapshot/SnapshotManagerImpl.java | 48 ++- .../com/cloud/template/TemplateManagerImpl.java | 14 +- .../java/com/cloud/usage/UsageServiceImpl.java | 3 +- .../cloudstack/backup/BackupManagerImpl.java | 2 +- .../cloudstack/user/UserPasswordResetManager.java | 4 +- .../user/UserPasswordResetManagerImpl.java | 26 +- .../cloud/resource/ResourceManagerImplTest.java | 14 +- .../ResourceLimitManagerImplTest.java | 10 +- .../storage/snapshot/SnapshotManagerImplTest.java | 92 +++++ systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- ui/README.md | 6 +- ui/package.json | 9 +- ui/public/locales/en.json | 14 +- ui/src/components/view/DedicateDomain.vue | 129 +++---- ui/src/components/view/ListView.vue | 22 ++ ui/src/components/widgets/InfiniteScrollSelect.vue | 91 ++++- ui/src/components/widgets/OsLogo.vue | 78 +++-- ui/src/config/section/storage.js | 17 +- ui/src/config/section/user.js | 21 +- ui/src/views/AutogenView.vue | 15 +- .../compute/wizard/OsBasedImageRadioGroup.vue | 3 +- ui/src/views/iam/AddUser.vue | 121 +++---- ui/src/views/infra/AddSecondaryStorage.vue | 82 ++++- ui/src/views/infra/UsageRecords.vue | 112 +++--- ui/src/views/infra/zone/ZoneWizardAddResources.vue | 25 +- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 + ui/src/views/network/AclRulesTab.vue | 32 +- ui/src/views/network/ImportNetworkACL.vue | 381 +++++++++++++++++++++ ui/src/views/storage/CreateTemplate.vue | 111 +++--- ui/src/views/storage/UploadLocalVolume.vue | 225 +++++------- ui/src/views/storage/UploadVolume.vue | 218 +++++------- ui/src/views/tools/CreateWebhook.vue | 126 +++---- ui/src/views/tools/ManageVolumes.vue | 157 ++++----- .../java/com/cloud/usage/UsageManagerImpl.java | 5 + .../main/java/com/cloud/utils/script/Script.java | 99 +++--- .../com/cloud/utils/server/ServerProperties.java | 36 +- .../main/java/com/cloud/utils/ssh/SshHelper.java | 73 +++- .../java/com/cloud/utils/script/ScriptTest.java | 30 ++ .../java/com/cloud/utils/ssh/SshHelperTest.java | 60 ++++ 91 files changed, 2677 insertions(+), 1078 deletions(-) diff --cc api/src/main/java/org/apache/cloudstack/alert/AlertService.java index cc3188feeca,14223227c34..c051ebb2da2 --- a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java +++ b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java @@@ -71,10 -71,9 +71,10 @@@ public interface AlertService public static final AlertType ALERT_TYPE_HA_ACTION = new AlertType((short)30, "ALERT.HA.ACTION", true); public static final AlertType ALERT_TYPE_CA_CERT = new AlertType((short)31, "ALERT.CA.CERT", true); public static final AlertType ALERT_TYPE_VM_SNAPSHOT = new AlertType((short)32, "ALERT.VM.SNAPSHOT", true); - public static final AlertType ALERT_TYPE_VR_PUBLIC_IFACE_MTU = new AlertType((short)32, "ALERT.VR.PUBLIC.IFACE.MTU", true); - public static final AlertType ALERT_TYPE_VR_PRIVATE_IFACE_MTU = new AlertType((short)32, "ALERT.VR.PRIVATE.IFACE.MTU", true); + public static final AlertType ALERT_TYPE_VR_PUBLIC_IFACE_MTU = new AlertType((short)33, "ALERT.VR.PUBLIC.IFACE.MTU", true); + public static final AlertType ALERT_TYPE_VR_PRIVATE_IFACE_MTU = new AlertType((short)34, "ALERT.VR.PRIVATE.IFACE.MTU", true); public static final AlertType ALERT_TYPE_EXTENSION_PATH_NOT_READY = new AlertType((short)33, "ALERT.TYPE.EXTENSION.PATH.NOT.READY", true); + public static final AlertType ALERT_TYPE_VPN_GATEWAY_OBSOLETE_PARAMETERS = new AlertType((short)34, "ALERT.S2S.VPN.GATEWAY.OBSOLETE.PARAMETERS", true); public static final AlertType ALERT_TYPE_BACKUP_STORAGE = new AlertType(Capacity.CAPACITY_TYPE_BACKUP_STORAGE, "ALERT.STORAGE.BACKUP", true); public static final AlertType ALERT_TYPE_OBJECT_STORAGE = new AlertType(Capacity.CAPACITY_TYPE_OBJECT_STORAGE, "ALERT.STORAGE.OBJECT", true);
