From 4adb16c0149612b95234ee9b74c6bede6ff6b7e3 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 4 Apr 2024 16:25:18 +0200 Subject: [PATCH 1/2] more explanatory error message on delete attempt of default system offering --- .../java/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 080bb83253c4..afc949278154 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -4204,7 +4204,7 @@ public boolean deleteServiceOffering(final DeleteServiceOfferingCmd cmd) { } if (offering.getDefaultUse()) { - throw new InvalidParameterValueException("Default service offerings cannot be deleted"); + throw new InvalidParameterValueException(String.format("The system service offerings [%s], is marked for default use and cannot be deleted", offering.getDisplayText())); } final User user = _userDao.findById(userId); From 0b1b18e6089a39cae0b900775b42819a908f3828 Mon Sep 17 00:00:00 2001 From: dahn Date: Fri, 5 Apr 2024 09:08:26 +0200 Subject: [PATCH 2/2] Update server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Co-authored-by: Gabriel Pordeus Santos --- .../java/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index afc949278154..f0e7522bc794 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -4204,7 +4204,7 @@ public boolean deleteServiceOffering(final DeleteServiceOfferingCmd cmd) { } if (offering.getDefaultUse()) { - throw new InvalidParameterValueException(String.format("The system service offerings [%s], is marked for default use and cannot be deleted", offering.getDisplayText())); + throw new InvalidParameterValueException(String.format("The system service offering [%s] is marked for default use and cannot be deleted", offering.getDisplayText())); } final User user = _userDao.findById(userId);